xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-13 01:40:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6725 from cxhong/confignics

Browse Source 
Remove confignics from xCAT documentation
This commit is contained in:
Mark Gurevich
2020-06-04 12:41:36 -04:00
committed by GitHub
parent 8d84208579 bd7ff51f6c
commit 518259192d
11 changed files with 11 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/source/advanced/networks/infiniband/network_configuration.rst
View File

@ -3,7 +3,7 @@ IB Network Configuration
xCAT provides a script ``configib`` to help configure the Infiniband adapters on the compute nodes.
The Infiniband adapter is considered an additional interface for xCAT. The process for configuring Infiniband adapters complies with the process of :doc:`Configure Additional Network Interfaces <../../../../guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter>`.
The Infiniband adapter is considered an additional interface for xCAT. The process for configuring Infiniband adapters complies with the process of :doc:`Configure Additional Network Interfaces <../../../../guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter>`.
Below are an simple example to configure Mellanox IB in Ubuntu 14.04.1 on Power8 LE
@ -25,12 +25,12 @@ If your target Mellanox IB adapter has 2 ports, and you plan to give port ib0 4
* To configure during node installation ::
chdef <node> -p postscripts="confignics --ibaports=2"
chdef <node> -p postscripts="confignetwork --ibaports=2"
nodeset <node> osimage=<osimagename>
rsetboot <node> net
rpower <node> reset
* To configure on a node which has had operating system ::
updatenode <node> -P "confignics --ibaports=2"
updatenode <node> -P "confignetwork --ibaports=2"

2
docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst
View File

@ -86,4 +86,4 @@ The default driver list: ::
Note: With this approach, xCAT will search for the drivers in the rootimage. You need to make sure the drivers have been included in the rootimage before generating the initrd. You can install the drivers manually in an existing rootimage (using chroot) and run genimage again, or you can use a postinstall script to install drivers to the rootimage during your initial genimage run.
Use the driver rpm package to add new drivers from rpm packages to the diskless initrd. Refer to the :doc:`/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter` for details.
Use the driver rpm package to add new drivers from rpm packages to the diskless initrd. Refer to the :doc:`/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter` for details.

133
docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
View File

@ -1,133 +0,0 @@
Configure Additional Network Interfaces old version - confignics - (deprecated)
===============================================================================
**"confignics" is deprecated, recommend using new version "confignetwork" instead.**
The **nics** table and the **confignics** postscript can be used to automatically configure additional network interfaces (multiple ethernets adapters, InfiniBand, etc) on the nodes as they are being deployed.
The way the confignics postscript decides what IP address to give the secondary adapter is by checking the nics table, in which the nic configuration information is stored.
To use the nics table and confignics postscript to define a secondary adapter on one or more nodes, follow these steps:
Define configuration information for the Secondary Adapters in the nics table
-----------------------------------------------------------------------------
There are 3 ways to complete this operation.
1. Using the ``mkdef`` and ``chdef`` commands ::
# mkdef cn1 groups=all nicips.eth1="11.1.89.7|12.1.89.7" nicnetworks.eth1="net11|net12" nictypes.eth1="Ethernet"
1 object definitions have been created or modified.
# chdef cn1 nicips.eth2="13.1.89.7|14.1.89.7" nicnetworks.eth2="net13|net14" nictypes.eth2="Ethernet"
1 object definitions have been created or modified.
2. Using an xCAT stanza file
- Prepare a stanza file ``<filename>.stanza`` with content similiar to the following: ::
# <xCAT data object stanza file>
cn1:
objtype=node
arch=x86_64
groups=kvm,vm,all
nichostnamesuffixes.eth1=-eth1-1|-eth1-2
nichostnamesuffixes.eth2=-eth2-1|-eth2-2
nicips.eth1=11.1.89.7|12.1.89.7
nicips.eth2=13.1.89.7|14.1.89.7
nicnetworks.eth1=net11|net12
nicnetworks.eth2=net13|net14
nictypes.eth1=Ethernet
nictypes.eth2=Ethernet
- Using the ``mkdef -z`` option, define the stanza file to xCAT: ::
# cat <filename>.stanza | mkdef -z
3. Using ``tabedit`` to edit the ``nics`` database table directly
The ``tabedit`` command opens the specified xCAT database table in a vi like editor and allows the user to edit any text and write the changes back to the database table.
*WARNING:* Using the ``tabedit`` command is not the recommended method because it is tedious and error prone.
After changing the content of the ``nics`` table, here is the result from ``tabdump nics`` ::
# tabdump nics
#node,nicips,nichostnamesuffixes,nictypes,niccustomscripts,nicnetworks,nicaliases,comments,disable
"cn1","eth1!11.1.89.7|12.1.89.7,eth2!13.1.89.7|14.1.89.7","eth1!-eth1-1|-eth1-2,eth2!-eth2-1|-eth2-2,"eth1!Ethernet,eth2!Ethernet",,"eth1!net11|net12,eth2!net13|net14",,,
After you have defined the configuration information in any of the ways above, run the ``makehosts`` command to add the new configuration to the ``/etc/hosts`` file. ::
# makehosts cn1
# cat /etc/hosts
11.1.89.7 cn1-eth1-1 cn1-eth1-1.ppd.pok.ibm.com
12.1.89.7 cn1-eth1-2 cn1-eth1-2.ppd.pok.ibm.com
13.1.89.7 cn1-eth2-1 cn1-eth2-1.ppd.pok.ibm.com
14.1.89.7 cn1-eth2-2 cn1-eth2-2.ppd.pok.ibm.com
Add confignics into the node's postscripts list
-----------------------------------------------
Use command below to add confignics into the node's postscripts list ::
chdef cn1 -p postscripts=confignics
**NOTE**: ``confignics`` is deprecated, you can also use ``chdef cn1 -p postscripts=confignetwork`` instead above ``chdef`` command.
By default, confignics does not configure the install nic. if need, using flag "-s" to allow the install nic to be configured. ::
chdef cn1 -p prostscripts="confignics -s"
Option "-s" writes the install nic's information into configuration file for persistence. All install nic's data defined in nics table will be written also.
**NOTE**: ``confignics`` is deprecated, you can also use ``chdef cn1 -p postscripts="confignetwork -s"`` instead above ``chdef`` command.
Add network object into the networks table
------------------------------------------
The ``nicnetworks`` attribute only defines the nic that uses the IP address.
Other information about the network should be defined in the ``networks`` table.
Use the ``tabedit`` command to add/modify the networks in the``networks`` table ::
tabdump networks
#netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers,dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,mtu,comments,disable
...
"net11", "11.1.89.0", "255.255.255.0", "eth1",,,,,,,,,,,,,,,,
"net12", "12.1.89.0", "255.255.255.0", "eth1",,,,,,,,,,,,,,,,
"net13", "13.1.89.0", "255.255.255.0", "eth2",,,,,,,,,,,,,,,,
"net14", "14.1.89.0", "255.255.255.0", "eth2",,,,,,,,,,,,,,,,
Option -r to remove the undefined NICS
--------------------------------------
If the compute node's nics were configured by ``confignics`` and the nics configuration changed in the nics table, user the ``confignics -r`` to remove the undefined nic.
For example, if on a compute node the ``eth0``, ``eth1``, and ``eth2`` nics were configured: ::
# ifconfig
eth0 Link encap:Ethernet HWaddr 00:14:5e:d9:6c:e6
...
eth1 Link encap:Ethernet HWaddr 00:14:5e:d9:6c:e7
...
eth2 Link encap:Ethernet HWaddr 00:14:5e:d9:6c:e8
...
Delete the eth2 definition in nics table using the ``chdef`` command.
Then run the following to remove the undefined ``eth2`` nic on the compute node: ::
updatenode <noderange> -P "confignics -r"
The result should have ``eth2`` disabled: ::
# ifconfig
eth0 Link encap:Ethernet HWaddr 00:14:5e:d9:6c:e6
...
eth1 Link encap:Ethernet HWaddr 00:14:5e:d9:6c:e7
...
Deleting the ``installnic`` will result in strange problems, so ``confignics -r`` will not delete the nic set as the ``installnic``.

2
docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst
View File

@ -632,7 +632,7 @@ This is an example of the generated postscript for a servicenode install. It is
export NETMASK
GATEWAY=10.2.0.100
export GATEWAY
# NIC related attributes for the node for confignics postscript
# NIC related attributes for the node for confignetwork postscript
NICIPS=""
export NICIPS
NICHOSTNAMESUFFIXES=""

2
docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter.rst
View File

@ -1,2 +0,0 @@
.. include:: ../../../../common/deployment/network/cfg_second_adapter.rst

1
docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst
View File

@ -7,5 +7,4 @@ This section describes how to configure network adapters with persistent configu
:maxdepth: 1
cfg_network_adapter.rst
cfg_second_adapter.rst
cfg_routes.rst

2
docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter.rst
View File

@ -1,2 +0,0 @@
.. include:: ../../../../common/deployment/network/cfg_second_adapter.rst

1
docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst
View File

@ -7,5 +7,4 @@ This section describes how to configure network adapters with persistent configu
:maxdepth: 1
cfg_network_adapter.rst
cfg_second_adapter.rst
cfg_routes.rst

1
xCAT/postscripts/configib
View File

@ -498,6 +498,7 @@ $nmcontrol
$devtype
BOOTPROTO=none
ONBOOT=yes
DEFROUTE=no
NAME=$nic
IPADDR=$nicip" > $dir/ifcfg-$nic
# ipv6

4
xCAT/postscripts/confignics
View File

@ -4,6 +4,7 @@
#-------------------------------------------------------------------------------
#=head1 confignics
#=head2 Used on Linux only. Config the Ethernet or InfiniBand adapters on the nodes
#=head3 confignics is deprecated, please use confignetwork instead
#
# You can run the following commands on MN:
# updatenode noderange confignics
@ -13,6 +14,9 @@
#=cut
#-------------------------------------------------------------------------------
logger -t $log_label -p local4.err "**NOTE**:confignics is deprecated, please use confignetwork instead"
echo "**NOTE**:confignics is deprecated, please use confignetwork instead"
exit 1
if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
str_dir_name=`dirname $0`

2
xCAT/postscripts/cumulusztp
View File

@ -161,7 +161,7 @@ echo './enablesnmp' >> ./mypostscript
#config base interface
echo './configinterface' >> ./mypostscript
#config static ip address for mgt interface
echo './confignics -s' >> ./mypostscript
echo './confignetwork -s' >> ./mypostscript
chmod 700 ./mypostscript
./mypostscript
rc=$?