From 76827a69ece33b84ab4f0c224474ee22d827e9e3 Mon Sep 17 00:00:00 2001 From: ligc Date: Tue, 23 Oct 2012 07:23:01 +0000 Subject: [PATCH] update the description for nics table to support multiple ip addresses per NIC git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14094 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Schema.pm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index 2c88e9041..819b3c3eb 100644 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -1231,12 +1231,24 @@ nics => { table_desc => 'Stores NIC details.', descriptions => { node => 'The node or group name.', - nicips => 'Comma-separated list of IP addresses per NIC. :,:,..., e.g eth0:10.0.0.100,eth1:11.0.0.100 The primary IP address must also be stored in the hosts.ip attribute.', - nichostnamesuffixes => 'Comma-separated list of hostname suffixes per NIC. :,:,... e.g. eth0:-eth0,ib0:-ib0.', + nicips => 'Comma-separated list of IP addresses per NIC. To specify one ip address per NIC: + :,:,..., for example, eth0:10.0.0.100,ib0:11.0.0.100 + To specify multiple ip addresses per NIC: + :|,:|,..., for example, eth0:10.0.0.100|fd55::214:5eff:fe15:849b,ib0:11.0.0.100|2001::214:5eff:fe15:849a + Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address.', + nichostnamesuffixes => 'Comma-separated list of hostname suffixes per NIC. + If only one ip address is associated with each NIC: + :,:,..., for example, eth0:-eth0,ib0:-ib0 + If multiple ip addresses are associcated with each NIC: + :|,:|,..., for example, eth0:-eth0|-eth0-ipv6,ib0:-ib0|-ib0-ipv6.', nictypes => 'Comma-separated list of NIC types per NIC. Used for information purposes. :,:, e.g. eth0:Ethernet,ib0:Infiniband', niccustomscripts => 'Comma-separated list of custom scripts per NIC. :,:, e.g. eth0:configeth eth0, ib0:configib ib0 .', - nicnetworks => 'Comma-separated list of networks connected to each NIC.:,:, eth0: 10_0_0_0-255_255_0_0, ib0: 11_0_0_0-255_255_0_0 + nicnetworks => 'Comma-separated list of networks connected to each NIC. + If only one ip address is associated with each NIC: + :,:, for example, eth0: 10_0_0_0-255_255_0_0, ib0: 11_0_0_0-255_255_0_0 + If multiple ip addresses are associated with each NIC: + :|,:|, for example, eth0: 10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64, ib0: 11_0_0_0-255_255_0_0|2001:db8:1:0::/64 ', comments => 'Any user-written notes.', disable => "Set to 'yes' or '1' to comment out this row.",