From e9ca72dc5fcf549846d2ac7686b1e48c24491600 Mon Sep 17 00:00:00 2001 From: bybai Date: Mon, 14 Dec 2015 02:01:13 -0500 Subject: [PATCH 1/9] add confignetwork doc --- .../common/deployment/cfg_network.rst | 98 +++++++++++++++++++ .../diskful/customize_image/cfg_network.rst | 1 + .../customize_image/cfg_network_adapter.rst | 8 ++ .../diskless/customize_image/cfg_network.rst | 1 + .../customize_image/cfg_network_adapter.rst | 8 ++ 5 files changed, 116 insertions(+) create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network.rst create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network.rst create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst new file mode 100644 index 000000000..cdfed56d8 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst @@ -0,0 +1,98 @@ +Configure BOND/VLAN/BRIDGE +=========================== + +The ``nics`` table and the ``confignetwork`` script can be used to automatically configure network interfaces (VLAN, BOND, BRIDGE) on the redhat nodes. + +To use ``confignetwork``, ``nicips``, ``nictypes``, ``nicnetworks`` and ``nicdevice`` attributes in ``nics`` table should be configured. + +``nicdevice`` resolves relationships among physical_nics/BOND/VLAN/BRIDGE. + +To use the nics table and confignetwork postscript to configure VLAN/BOND/BRIDGE on one or more nodes, here gives an example: + + a. Physical nics are eth2 and eth3 + b. Bonding eth2 and eth3 as bond0 + c. From bond0, make 2 vlans: bond0.1 and bond0.2 + d. Making bridge br1 using bond0.1, making bridge br2 using bond0.2, br1 ip is 10.0.0.1, br2 ip is 20.0.0.1 + +You should execute these steps: + +Define configuration information for the BOND/VLAN/BRIDGE Adapters in the nics table +------------------------------------------------------------------------------------- + +There are 3 ways to complete this operation. + +#. Using the ``mkdef`` or ``chdef`` commands + + a. add nicdevice to define nics relationship :: + + chdef cn1 nicdevice.br1=bond0.1 nicdevice.br2=bond0.2 nicdevice.bond0.1=bond0 nicdevice.bond0.2=bond0 nicdevice.bond0="eth2|eth3" + + b. add nictypes and nicnetworks :: + + chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet nictypes.bond0=bond nictypes.bond0.1=vlan nictypes.bond0.2=vlan nictypes.br1=bridge nictypes.br2=bridge nicips.br1=10.0.0.1 nicips.br2=20.0.0.1 nicnetworks.br1="net10" nicnetworks.br2="net20" + +#. Using an xCAT stanza file + + - Prepare a stanza file ``.stanza`` with content similiar to the following: :: + + # + cn1: + objtype=node + arch=x86_64 + groups=kvm,vm,all + nicdevice.br1=bond0.1 + nicdevice.br2=bond0.2 + nicdevice.bond0.1=bond0 + nicdevice.bond0.2=bond0 + nicdevice.bond0=eth2|eth3 + nictypes.eth2=ethernet + nictypes.eth3=ethernet + nictypes.bond0=bond + nictypes.bond0.1=vlan + nictypes.bond0.2=vlan + nictypes.br1=bridge + nictypes.br2=bridge + nicips.br1=10.0.0.1 + nicips.br2=20.0.0.1 + nicnetworks.br1="net10" + nicnetworks.br2="net20" + + - Using the ``mkdef -z`` option, define the stanza file to xCAT: :: + + cat .stanza | mkdef -z + +#. 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,nichostnameprefixes,nictypes,niccustomscripts,nicnetworks,nicaliases,nicextraparams,nicdevice,comments,disable + "cn1","br1!10.0.0.1,br2!20.0.0.1",,,"br1!bridge,eth2!ethernet,eth3!ethernet,bond0.2!vlan,bond0!bond,br2!bridge,bond0.1!vlan",,"br1!net10,br2!net20",,,"br1!bond0.1,bond0!eth2|eth3,bond0.2!bond0,bond0.1!bond0,br2!bond0.2",, + +Add confignetwork into the node's postscripts list +----------------------------------------------- + +Using below command to add confignetwork into the node's postscripts list :: + + chdef cn1 -p postscripts=confignetwork + +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 :: + + #netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers,dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,comments,disable + "net10","10.0.0.0","255.0.0.0","eth0",,,,,,,,,,,,,,, + "net20","20.0.0.0","255.0.0.0","eth1",,,,,,,,,,,,,,, + + + + + diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network.rst new file mode 100644 index 000000000..27d35cf7d --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network.rst @@ -0,0 +1 @@ +.. include:: ../../../common/deployment/cfg_network.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst new file mode 100644 index 000000000..d3a6462e5 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst @@ -0,0 +1,8 @@ +Customize network adapter +============================ + +.. toctree:: + :maxdepth: 2 + + cfg_second_adapter.rst + cfg_network.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network.rst new file mode 100644 index 000000000..27d35cf7d --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network.rst @@ -0,0 +1 @@ +.. include:: ../../../common/deployment/cfg_network.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst new file mode 100644 index 000000000..d3a6462e5 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst @@ -0,0 +1,8 @@ +Customize network adapter +============================ + +.. toctree:: + :maxdepth: 2 + + cfg_second_adapter.rst + cfg_network.rst From 65971caaa46ff26aaacc63652f5768f0c22084ce Mon Sep 17 00:00:00 2001 From: bybai Date: Tue, 26 Jan 2016 03:43:11 -0500 Subject: [PATCH 2/9] polish based on comments --- .../common/deployment/cfg_network.rst | 67 ++++++++++++------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst index cdfed56d8..2e7186c7c 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst @@ -5,31 +5,43 @@ The ``nics`` table and the ``confignetwork`` script can be used to automatically To use ``confignetwork``, ``nicips``, ``nictypes``, ``nicnetworks`` and ``nicdevice`` attributes in ``nics`` table should be configured. -``nicdevice`` resolves relationships among physical_nics/BOND/VLAN/BRIDGE. +``nicdevices`` resolves relationships among physical_nics, BOND, VLAN, BRIDGE. -To use the nics table and confignetwork postscript to configure VLAN/BOND/BRIDGE on one or more nodes, here gives an example: +Following example will be used in the whole doc to describe how to use confignetwork postscript. a. Physical nics are eth2 and eth3 b. Bonding eth2 and eth3 as bond0 c. From bond0, make 2 vlans: bond0.1 and bond0.2 d. Making bridge br1 using bond0.1, making bridge br2 using bond0.2, br1 ip is 10.0.0.1, br2 ip is 20.0.0.1 -You should execute these steps: - -Define configuration information for the BOND/VLAN/BRIDGE Adapters in the nics table -------------------------------------------------------------------------------------- +Define nic attributes in the nics table +---------------------------------------- There are 3 ways to complete this operation. #. Using the ``mkdef`` or ``chdef`` commands - a. add nicdevice to define nics relationship :: + a. add nicdevices to define nics relationship :: - chdef cn1 nicdevice.br1=bond0.1 nicdevice.br2=bond0.2 nicdevice.bond0.1=bond0 nicdevice.bond0.2=bond0 nicdevice.bond0="eth2|eth3" + chdef cn1 nicdevices.br1=bond0.1 \ + nicdevices.br2=bond0.2 \ + nicdevices.bond0.1=bond0 \ + nicdevices.bond0.2=bond0 \ + nicdevices.bond0="eth2|eth3" b. add nictypes and nicnetworks :: - chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet nictypes.bond0=bond nictypes.bond0.1=vlan nictypes.bond0.2=vlan nictypes.br1=bridge nictypes.br2=bridge nicips.br1=10.0.0.1 nicips.br2=20.0.0.1 nicnetworks.br1="net10" nicnetworks.br2="net20" + chdef cn1 nictypes.eth2=ethernet \ + nictypes.eth3=ethernet \ + nictypes.bond0=bond \ + nictypes.bond0.1=vlan \ + nictypes.bond0.2=vlan \ + nictypes.br1=bridge \ + nictypes.br2=bridge \ + nicips.br1=10.0.0.1 \ + nicips.br2=20.0.0.1 \ + nicnetworks.br1="net10" \ + nicnetworks.br2="net20" #. Using an xCAT stanza file @@ -40,11 +52,11 @@ There are 3 ways to complete this operation. objtype=node arch=x86_64 groups=kvm,vm,all - nicdevice.br1=bond0.1 - nicdevice.br2=bond0.2 - nicdevice.bond0.1=bond0 - nicdevice.bond0.2=bond0 - nicdevice.bond0=eth2|eth3 + nicdevices.br1=bond0.1 + nicdevices.br2=bond0.2 + nicdevices.bond0.1=bond0 + nicdevices.bond0.2=bond0 + nicdevices.bond0=eth2|eth3 nictypes.eth2=ethernet nictypes.eth3=ethernet nictypes.bond0=bond @@ -63,16 +75,27 @@ There are 3 ways to complete this operation. #. 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. + 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,nichostnameprefixes,nictypes,niccustomscripts,nicnetworks,nicaliases,nicextraparams,nicdevice,comments,disable + #node,nicips,nichostnamesuffixes,nichostnameprefixes,nictypes,niccustomscripts,nicnetworks,nicaliases,nicextraparams,nicdevices,comments,disable "cn1","br1!10.0.0.1,br2!20.0.0.1",,,"br1!bridge,eth2!ethernet,eth3!ethernet,bond0.2!vlan,bond0!bond,br2!bridge,bond0.1!vlan",,"br1!net10,br2!net20",,,"br1!bond0.1,bond0!eth2|eth3,bond0.2!bond0,bond0.1!bond0,br2!bond0.2",, +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 ``chdef`` command to add/modify the networks in the ``networks`` table :: + + chdef -t network net10 net=10.0.0.0 mask=255.0.0.0 mgtifname=eth0 + chdef -t network net20 net=20.0.0.0 mask=255.0.0.0 mgtifname=eth1 + Add confignetwork into the node's postscripts list ----------------------------------------------- @@ -80,17 +103,11 @@ Using below command to add confignetwork into the node's postscripts list :: chdef cn1 -p postscripts=confignetwork -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. +During OS deployment on compute node, confignetwork will be run in postscript. +If the compute node has OS, use ``updatenode`` command to run ``confignetwork`` :: -Use the ``tabedit`` command to add/modify the networks in the ``networks`` table :: - - #netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers,dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,comments,disable - "net10","10.0.0.0","255.0.0.0","eth0",,,,,,,,,,,,,,, - "net20","20.0.0.0","255.0.0.0","eth1",,,,,,,,,,,,,,, + updatenode -P confignetwork From 11bfe6aa6c1cde51fb574e9b6e1bc827feb3fad3 Mon Sep 17 00:00:00 2001 From: bybai Date: Wed, 27 Jan 2016 03:23:44 -0500 Subject: [PATCH 3/9] polish confignetwork doc --- .../common/deployment/cfg_network.rst | 74 ++++++++++--------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst index 2e7186c7c..29e5fd6e8 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst @@ -1,46 +1,54 @@ -Configure BOND/VLAN/BRIDGE -=========================== +Advanced Networking Configuration +================================= -The ``nics`` table and the ``confignetwork`` script can be used to automatically configure network interfaces (VLAN, BOND, BRIDGE) on the redhat nodes. +The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support VLAN, BONDs, and BRIDGES. In order to use the ``confignetwork`` postscript, the following attributes must be configured for the node in the ``nics`` table: -To use ``confignetwork``, ``nicips``, ``nictypes``, ``nicnetworks`` and ``nicdevice`` attributes in ``nics`` table should be configured. + * ``nicips`` + * ``nictypes`` + * ``nicnetworks`` + * ``nicdevices`` - resolves the relationship among the physical network intereface devices -``nicdevices`` resolves relationships among physical_nics, BOND, VLAN, BRIDGE. +The following example set the xCAT properties for compute node ``cn1`` to achieve the following network configuration using the ``confignetwork`` postscript: -Following example will be used in the whole doc to describe how to use confignetwork postscript. + * Compute node ``cn`` has two physical NICs: eth2 and eth3 + * Bond eth2 and eth3 as ``bond0`` + * From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2`` + * Make bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1) + * Make bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1) - a. Physical nics are eth2 and eth3 - b. Bonding eth2 and eth3 as bond0 - c. From bond0, make 2 vlans: bond0.1 and bond0.2 - d. Making bridge br1 using bond0.1, making bridge br2 using bond0.2, br1 ip is 10.0.0.1, br2 ip is 20.0.0.1 - -Define nic attributes in the nics table ----------------------------------------- - -There are 3 ways to complete this operation. +Define attributes in the ``nics`` table +--------------------------------------- #. Using the ``mkdef`` or ``chdef`` commands - a. add nicdevices to define nics relationship :: + a. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` :: - chdef cn1 nicdevices.br1=bond0.1 \ - nicdevices.br2=bond0.2 \ - nicdevices.bond0.1=bond0 \ - nicdevices.bond0.2=bond0 \ + chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet + + b. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` :: + + chdef cn1 nictypes.bond0=bond \ nicdevices.bond0="eth2|eth3" - b. add nictypes and nicnetworks :: + c. Fom ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2`` :: - chdef cn1 nictypes.eth2=ethernet \ - nictypes.eth3=ethernet \ - nictypes.bond0=bond \ - nictypes.bond0.1=vlan \ + chdef cn1 nictypes.bond0.1=vlan \ nictypes.bond0.2=vlan \ - nictypes.br1=bridge \ - nictypes.br2=bridge \ + nicdevices.bond0.1=bond0 \ + nicdevices.bond0.2=bond0 + + d. Create bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1) :: + + chdef cn1 nictypes.br1=bridge \ + nicdevices.br1=bond0.1 \ nicips.br1=10.0.0.1 \ + nicnetworks.br1="net10" + + e. Create bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1) :: + + chdef cn1 nictypes.br2=bridge \ + nicdevices.br2=bond0.2 \ nicips.br2=20.0.0.1 \ - nicnetworks.br1="net10" \ nicnetworks.br2="net20" #. Using an xCAT stanza file @@ -77,8 +85,6 @@ There are 3 ways to complete this operation. 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 @@ -97,17 +103,17 @@ Use the ``chdef`` command to add/modify the networks in the ``networks`` table : chdef -t network net20 net=20.0.0.0 mask=255.0.0.0 mgtifname=eth1 Add confignetwork into the node's postscripts list ------------------------------------------------ +-------------------------------------------------- -Using below command to add confignetwork into the node's postscripts list :: +Using below command to add ``confignetwork`` into the node's postscripts list :: chdef cn1 -p postscripts=confignetwork -During OS deployment on compute node, confignetwork will be run in postscript. +During OS deployment on compute node, ``confignetwork`` will be run in postscript. If the compute node has OS, use ``updatenode`` command to run ``confignetwork`` :: - updatenode -P confignetwork + updatenode cn1 -P confignetwork From efb9410ade59ba7f484dad57b5dc713d460ffe13 Mon Sep 17 00:00:00 2001 From: bybai Date: Thu, 28 Jan 2016 01:38:34 -0500 Subject: [PATCH 4/9] polish --- .../manage_clusters/ppc64le/diskful/customize_image/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst index fc12ba338..5b0cecea4 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst @@ -11,6 +11,6 @@ Optional means all the subitems in this page are not necessary to finish an OS d pre_post_script.rst syncfile.rst additional_pkg.rst - cfg_second_adapter.rst + cfg_network_adapter.rst From c93415987c7b260f661c2b3a808b497732765580 Mon Sep 17 00:00:00 2001 From: bybai Date: Thu, 28 Jan 2016 01:38:47 -0500 Subject: [PATCH 5/9] polish --- .../manage_clusters/ppc64le/diskless/customize_image/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst index 1e076c7eb..9f76ecbc8 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst @@ -10,7 +10,7 @@ Optional means all the subitems in this page are not necessary to finish an OS d pre_post_script.rst syncfile.rst additional_pkg.rst - cfg_second_adapter.rst + cfg_network_adapter.rst enable_kdump.rst install_new_kernel.rst acc_initrd_rootimg_gen_ppc64le.rst From 9c6e5ea74caa0b1f10c829d9f63dc621adecdb9c Mon Sep 17 00:00:00 2001 From: bybai Date: Thu, 28 Jan 2016 01:39:11 -0500 Subject: [PATCH 6/9] polish --- .../ppc64le/diskless/customize_image/cfg_network_adapter.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst index d3a6462e5..e68b5756f 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst @@ -1,8 +1,8 @@ Customize network adapter -============================ +========================= .. toctree:: - :maxdepth: 2 + :maxdepth: 2 cfg_second_adapter.rst cfg_network.rst From 244dd4a23ac298b6a7ebad0cc14dd2874cb75c04 Mon Sep 17 00:00:00 2001 From: bybai Date: Thu, 28 Jan 2016 01:39:21 -0500 Subject: [PATCH 7/9] polish --- .../ppc64le/diskful/customize_image/cfg_network_adapter.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst index d3a6462e5..e68b5756f 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst @@ -1,8 +1,8 @@ Customize network adapter -============================ +========================= .. toctree:: - :maxdepth: 2 + :maxdepth: 2 cfg_second_adapter.rst cfg_network.rst From 53deb393263e1614d64d501eed511652f49d9b91 Mon Sep 17 00:00:00 2001 From: bybai Date: Mon, 1 Feb 2016 03:06:53 -0500 Subject: [PATCH 8/9] polish cfg_network.rst --- .../manage_clusters/common/deployment/cfg_network.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst index 29e5fd6e8..62aa74de1 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst @@ -10,7 +10,7 @@ The ``confignetwork`` postscript can be used to configure the network interfaces The following example set the xCAT properties for compute node ``cn1`` to achieve the following network configuration using the ``confignetwork`` postscript: - * Compute node ``cn`` has two physical NICs: eth2 and eth3 + * Compute node ``cn1`` has two physical NICs: eth2 and eth3 * Bond eth2 and eth3 as ``bond0`` * From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2`` * Make bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1) @@ -74,8 +74,8 @@ Define attributes in the ``nics`` table nictypes.br2=bridge nicips.br1=10.0.0.1 nicips.br2=20.0.0.1 - nicnetworks.br1="net10" - nicnetworks.br2="net20" + nicnetworks.br1=net10 + nicnetworks.br2=net20 - Using the ``mkdef -z`` option, define the stanza file to xCAT: :: From b117e1b6d9bbf0dc3731c243a64ef63b26b557e1 Mon Sep 17 00:00:00 2001 From: bybai Date: Mon, 1 Feb 2016 22:24:20 -0500 Subject: [PATCH 9/9] add confignetwork in text --- .../manage_clusters/common/deployment/cfg_network.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst index 62aa74de1..aa0e78f03 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst @@ -102,8 +102,8 @@ Use the ``chdef`` command to add/modify the networks in the ``networks`` table : chdef -t network net10 net=10.0.0.0 mask=255.0.0.0 mgtifname=eth0 chdef -t network net20 net=20.0.0.0 mask=255.0.0.0 mgtifname=eth1 -Add confignetwork into the node's postscripts list --------------------------------------------------- +Add ``confignetwork`` into the node's postscripts list +------------------------------------------------------ Using below command to add ``confignetwork`` into the node's postscripts list ::