fix missing updates
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13853 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
parent
e921722aa2
commit
b549d78e2e
@ -200,6 +200,7 @@ vm => {
|
||||
'storagemodel' => 'Model of storage devices to provide to guest',
|
||||
'cfgstore' => 'Optional location for persistant storage separate of emulated hard drives for virtualization solutions that require persistant store to place configuration data',
|
||||
'memory' => 'Megabytes of memory the VM currently should be set to.',
|
||||
'master' => 'The name of a master image, if any, this virtual machine is linked to. This is generally set by clonevm and indicates the deletion of a master that would invalidate the storage of this virtual machine',
|
||||
'cpus' => 'Number of CPUs the node should see.',
|
||||
'nics' => 'Network configuration parameters. Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan. physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches. hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible.',
|
||||
'nicmodel' => 'Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc)',
|
||||
@ -212,7 +213,8 @@ vm => {
|
||||
qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level
|
||||
clonemethod=[qemu-img|reflink]
|
||||
qemu-img allows use of qcow2 to generate virtualization layer copy-on-write
|
||||
reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs placement_affinity=[migratable|user_migratable|pinned]',
|
||||
reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs
|
||||
placement_affinity=[migratable|user_migratable|pinned]',
|
||||
'vncport' => 'Tracks the current VNC display port (currently not meant to be set',
|
||||
'textconsole' => 'Tracks the Psuedo-TTY that maps to the serial port or console of a VM',
|
||||
'powerstate' => "This flag is used by xCAT to track the last known power state of the VM.",
|
||||
@ -220,7 +222,7 @@ vm => {
|
||||
'guestostype' => "This allows administrator to specify an identifier for OS to pass through to virtualization stack. Normally this should be ignored as xCAT will translate from nodetype.os rather than requiring this field be used\n",
|
||||
'beacon' => "This flag is used by xCAT to track the state of the identify LED with respect to the VM.",
|
||||
'datacenter' => "Optionally specify a datacenter for the VM to exist in (only applicable to VMWare)",
|
||||
'cluster' => 'Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor.',
|
||||
'cluster' => 'Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor.',
|
||||
'vidproto' => "Request a specific protocol for remote video access be set up. For example, spice in KVM.",
|
||||
'vidmodel' => "Model of video adapter to provide to guest. For example, qxl in KVM",
|
||||
'vidpassword' => "Password to use instead of temporary random tokens for VNC and SPICE access",
|
||||
@ -233,7 +235,7 @@ hypervisor => {
|
||||
descriptions => {
|
||||
'node' => 'The node or static group name',
|
||||
'type' => 'The plugin associated with hypervisor specific commands such as revacuate',
|
||||
mgr => 'The virtualization specific manager of this hypervisor when applicable',
|
||||
'mgr' => 'The virtualization specific manager of this hypervisor when applicable',
|
||||
'interface' => 'The definition of interfaces for the hypervisor. The format is [networkname:interfacename:bootprotocol:IP:netmask:gateway] that split with | for each interface',
|
||||
'netmap' => 'Optional mapping of useful names to relevant physical ports. For example, 10ge=vmnic_16.0&vmnic_16.1,ge=vmnic1 would be requesting two virtual switches to be created, one called 10ge with vmnic_16.0 and vmnic_16.1 bonded, and another simply connected to vmnic1. Use of this allows abstracting guests from network differences amongst hypervisors',
|
||||
'defaultnet' => 'Optionally specify a default network entity for guests to join to if they do not specify.',
|
||||
@ -1011,8 +1013,8 @@ switch => {
|
||||
node => 'The node name or group name.',
|
||||
switch => 'The switch hostname.',
|
||||
port => 'The port number in the switch that this node is connected to. On a simple 1U switch, an administrator can generally enter the number as printed next to the ports, and xCAT will understand switch representation differences. On stacked switches or switches with line cards, administrators should usually use the CLI representation (i.e. 2/0/1 or 5/8). One notable exception is stacked SMC 8848M switches, in which you must add 56 for the proceeding switch, then the port number. For example, port 3 on the second switch in an SMC8848M stack would be 59',
|
||||
vlan => 'xCAT currently does not make use of this field, however it may do so in the future. For now, it can be used by administrators for their own purposes, but keep in mind some xCAT feature later may try to enforce this if set',
|
||||
interface => 'The interface name from the node perspective. This is not currently used by xCAT, but administrators may wish to use this for their own purposes',
|
||||
vlan => 'The ID for the tagged vlan that is created on this port using mkvlan and chvlan commands.',
|
||||
interface => 'The interface name from the node perspective. For example, eth0. For the primary nic, it can be empty, the word "primary" or "primary:ethx" where ethx is the interface name.',
|
||||
comments => 'Any user-written notes.',
|
||||
disable => "Set to 'yes' or '1' to comment out this row.",
|
||||
},
|
||||
@ -1169,13 +1171,14 @@ prescripts => {
|
||||
},
|
||||
|
||||
routes => {
|
||||
cols => [qw(routename net mask gateway comments disable)],
|
||||
cols => [qw(routename net mask gateway ifname comments disable)],
|
||||
keys => [qw(routename)],
|
||||
table_desc => 'Describes the additional routes needed to be setup in the os routing table. These routes usually are used to connect the management node to the compute node using the servie node as gateway.',
|
||||
descriptions => {
|
||||
routename => 'Name used to identify this route.',
|
||||
net => 'The network address.',
|
||||
mask => 'The network mask.',
|
||||
ifname => '(optional) The interface name of the management node facing the gateway.',
|
||||
gateway => 'The gateway that routes the ip traffic from the mn to the nodes. It is usually a service node.',
|
||||
comments => 'Any user-written notes.',
|
||||
disable => "Set to 'yes' or '1' to comment out this row.",
|
||||
@ -1931,6 +1934,12 @@ my @nodeattrs = (
|
||||
tabentry => 'mp.id',
|
||||
access_tabentry => 'mp.node=attr:node',
|
||||
},
|
||||
{attr_name => 'id',
|
||||
only_if => 'mgt=ipmi',
|
||||
tabentry => 'mp.id',
|
||||
access_tabentry => 'mp.node=attr:node',
|
||||
},
|
||||
|
||||
#################
|
||||
# mpa table #
|
||||
#################
|
||||
@ -2025,10 +2034,6 @@ my @nodeattrs = (
|
||||
tabentry => 'vm.migrationdest',
|
||||
access_tabentry => 'vm.node=attr:node',
|
||||
},
|
||||
{attr_name => 'vmtemplate',
|
||||
tabentry => 'vm.template',
|
||||
access_tabentry => 'vm.node=attr:node',
|
||||
},
|
||||
{attr_name => 'vmstorage',
|
||||
tabentry => 'vm.storage',
|
||||
access_tabentry => 'vm.node=attr:node',
|
||||
@ -2081,6 +2086,29 @@ my @nodeattrs = (
|
||||
tabentry => 'vm.beacon',
|
||||
access_tabentry => 'vm.node=attr:node',
|
||||
},
|
||||
{attr_name => 'vmcluster',
|
||||
tabentry => 'vm.cluster',
|
||||
access_tabentry => 'vm.node=attr:node',
|
||||
},
|
||||
######################
|
||||
# hypervisor table #
|
||||
######################
|
||||
{attr_name => 'hosttype',
|
||||
tabentry => 'hypervisor.type',
|
||||
access_tabentry => 'hypervisor.node=attr:node',
|
||||
},
|
||||
{attr_name => 'hostinterface',
|
||||
tabentry => 'hypervisor.interface',
|
||||
access_tabentry => 'hypervisor.node=attr:node',
|
||||
},
|
||||
{attr_name => 'hostmanager',
|
||||
tabentry => 'hypervisor.mgr',
|
||||
access_tabentry => 'hypervisor.node=attr:node',
|
||||
},
|
||||
{attr_name => 'hostcluster',
|
||||
tabentry => 'hypervisor.cluster',
|
||||
access_tabentry => 'hypervisor.node=attr:node',
|
||||
},
|
||||
######################
|
||||
# websrv table #
|
||||
######################
|
||||
@ -2632,6 +2660,10 @@ push(@{$defspec{node}->{'attrs'}}, @nodeattrs);
|
||||
{attr_name => 'gateway',
|
||||
tabentry => 'routes.gateway',
|
||||
access_tabentry => 'routes.routename=attr:routename',
|
||||
},
|
||||
{attr_name => 'ifname',
|
||||
tabentry => 'routes.ifname',
|
||||
access_tabentry => 'routes.routename=attr:routename',
|
||||
},
|
||||
{attr_name => 'usercomment',
|
||||
tabentry => 'routes.comments',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user