mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-23 22:50:09 +03:00
Merge branch 'master' of https://github.com/OpenNebula/one-ee
This commit is contained in:
commit
26059fe5fc
@ -1350,7 +1350,7 @@ CommandParser::CmdParser.new(ARGV) do
|
||||
FEATURES = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "IOTHREADS"]
|
||||
INPUT = ["TYPE", "BUS"]
|
||||
GRAPHICS = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
|
||||
RAW = ["DATA", "DATA_VMX", "TYPE"]
|
||||
RAW = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
|
||||
CPU_MODEL = ["MODEL"]
|
||||
CONTEXT (any value, **variable substitution will be made**)
|
||||
EOT
|
||||
|
@ -235,6 +235,7 @@ std::map<std::string,std::vector<std::string>> VirtualMachineTemplate::UPDATECON
|
||||
{"RAW",
|
||||
{ "TYPE",
|
||||
"DATA",
|
||||
"VALIDATE",
|
||||
"DATA_VMX"}
|
||||
},
|
||||
{"CPU_MODEL",
|
||||
|
Loading…
x
Reference in New Issue
Block a user