diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst index 384564b55..92d98cb0d 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst @@ -1,14 +1,14 @@ Configure Aliases ----------------- -The following example set the xCAT properties for compute node ``cn1`` to create: +The following example sets the xCAT properties for compute node ``cn1`` to create: - * Compute node ``cn1`` has one physical NIC: eth2 + * Compute node ``cn1`` with one physical NIC: ``eth2`` * User wants to configure aliases ``aliases1-1`` and ``aliases1-2`` * Assign ip ``11.1.0.100`` to ``aliases1-1`` and ``12.1.0.100`` to ``aliases1-2`` Add network object into the networks table -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add/modify the networks in the ``networks`` table :: @@ -16,7 +16,7 @@ Add/modify the networks in the ``networks`` table :: chdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 Define attributes in the ``nics`` table -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. Compute node ``cn1`` has one physical NICs: ``eth2`` :: @@ -32,7 +32,7 @@ Define attributes in the ``nics`` table chdef cn1 nicnetworks.eth2="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" Update /etc/hosts -~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~ #. Update the ``/etc/hosts`` file :: @@ -44,7 +44,7 @@ Update /etc/hosts 12.1.0.100 cn1-eth2-1 cn1-eth2-1.cluster.com aliases1-2 Enable ``confignetwork`` to configure aliases -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. Add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node :: @@ -55,9 +55,9 @@ Enable ``confignetwork`` to configure aliases updatenode cn1 -P confignetwork Check the result -~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ -Check if eth2 is configured correct or not :: +Check if eth2 is configured correctly :: xdsh cn1 "ip addr show eth2" diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst index f7b78bc26..0ed1084d4 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst @@ -1,9 +1,9 @@ Configure Bond using two Ethernet Adapters ------------------------------------------ -The following example set the xCAT properties for compute node ``cn1`` to create: +The following example sets the xCAT properties for compute node ``cn1`` to create: - * Compute node ``cn1`` has two physical NICs: eth2 and eth3 + * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` * Bond eth2 and eth3 as ``bond0`` * Assign ip ``40.0.0.1`` to the bonded interface ``bond0`` @@ -33,7 +33,7 @@ Define attributes in the ``nics`` table Enable ``confignetwork`` to configure bond ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node :: +#. If adding ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node :: chdef cn1 -p postscripts=confignetwork @@ -50,4 +50,4 @@ Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network- * ``mode=802.3ad`` requires additional configuration on the switch. - +* ``mode=2`` can be used for bonding without additional switch configuration. diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst index 2b7f4e896..ffe1006f2 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst @@ -1,9 +1,9 @@ Configure Bridge Based on Bond Adapters --------------------------------------- -The following example set the xCAT properties for compute node ``cn1`` to create: +The following example sets the xCAT properties for compute node ``cn1`` to create: - * Compute node ``cn1`` has two physical NICs: eth2 and eth3 + * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` * Bond eth2 and eth3 as ``bond0`` * Create bridge ``br0`` based on ``bond0`` * Assign ip ``40.0.0.1`` to the bridge interface ``br0`` @@ -37,7 +37,7 @@ Define attributes in the ``nics`` table Enable ``confignetwork`` to configure bridge ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node :: +#. If adding ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node :: chdef cn1 -p postscripts=confignetwork diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst index c58769c8f..b56020045 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst @@ -1,9 +1,9 @@ Configure VLAN Based on Bond Adapters ------------------------------------- -The following example set the xCAT properties for compute node ``cn1`` to create: +The following example sets the xCAT properties for compute node ``cn1`` to create: - * Compute node ``cn1`` has two physical NICs: eth2 and eth3 + * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` * Bond eth2 and eth3 as ``bond0`` * Create bridge ``bond0.1`` based on ``bond0`` * Assign ip ``40.0.0.1`` to the bridge interface ``bond0.1`` @@ -34,9 +34,9 @@ Define attributes in the ``nics`` table chdef cn1 nicnetworks.bond0.1=net40 Enable ``confignetwork`` to configure bridge -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node :: +#. If adding ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node :: chdef cn1 -p postscripts=confignetwork diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst index b2c3d5737..64001f546 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst @@ -10,7 +10,7 @@ The following example set the xCAT properties for compute node ``cn1`` to achiev * Make bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1) Define the additional networks to xCAT -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If this is a new network being created on the compute nodes, an entry needs to be created into the xCAT database. diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst index f553525dc..78d650431 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst @@ -8,7 +8,7 @@ The following example set the xCAT properties for compute node ``cn1`` to create * Assign ip ``30.5.106.9`` to br0 Add network object into the networks table -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add/modify the network ``net30`` in the ``networks`` table :: diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst index a63ee4608..8b352f3f3 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst @@ -3,7 +3,7 @@ Use Customized Scripts To Configure NIC If using customized script to configure NIC, ``niccustomscripts`` for the specified nic in ``nics`` table should be configured. In the customized scripts, it can use data from xCAT DB, These data are parsed as global value from ``/xcatpost/mypostscript`` in compute node. Here is a simple example : - #. Compute node ``cn1`` has one physical NIC: eth1 + #. Compute node ``cn1`` with one physical NIC: ``eth1`` #. Put customized script ``cfgeth1`` under xCAT MN ``/install/postscripts`` #. Configure ``niccustomscripts`` in ``nics`` table :: chdef cn1 niccustomscripts.eth1=cfgeth1 @@ -12,15 +12,15 @@ If using customized script to configure NIC, ``niccustomscripts`` for the specif chdef -t network net50 net=50.0.0.0 mask=255.0.0.0 - The network ``net50`` is parsed as ``NETWORKS_LINE1`` in ``/xcatpost/mypostscript`` as following, so script ``cfgeth1`` can use global value ``NETWORKS_LINE1`` directly. :: + **Notes:** The network ``net50`` is parsed as ``NETWORKS_LINE1`` in ``/xcatpost/mypostscript`` as following, so script ``cfgeth1`` can use global value ``NETWORKS_LINE1`` directly :: NETWORKS_LINE1='netname=net50||net=50.0.0.0||mask=255.0.0.0||mgtifname=||gateway=||dhcpserver=||tftpserver=||nameservers=||ntpservers=||logservers=||dynamicrange=||staticrange=||staticrangeincrement=||nodehostname=||ddnsdomain=||vlanid=||domain=||disable=||comments=' - #. When ``confignetwork`` is running in ``cn1``, ``confignetwork`` will execute ``cfgeth1`` to configure eth1. So add ``confignetwork`` into the node's postscripts list :: + #. When ``confignetwork`` is running in ``cn1``, ``confignetwork`` will execute ``cfgeth1`` to configure eth1, so adding ``confignetwork`` into the node's postscripts list. During OS deployment on compute node, ``confignetwork`` postscript will be executed. :: chdef cn1 -p postscripts=confignetwork - During OS deployment on compute node, ``confignetwork`` postscript will be executed. If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node:: + #. Or if the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node:: updatenode cn1 -P confignetwork diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst index 2eba4017a..215178679 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst @@ -1,9 +1,9 @@ Configure Ethernet Network Interface ------------------------------------ -The following example set the xCAT properties for compute node ``cn1`` to create: +The following example sets the xCAT properties for compute node ``cn1`` to create: - * Compute node ``cn1`` has two physical NICs: ``eth0`` and ``eth1`` + * Compute node ``cn1`` with two physical NICs: ``eth0`` and ``eth1`` * Management network is ``11.1.89.0``, application network is ``13.1.89.0`` * The install NIC is eth0, and application NIC is eth1 * Assign static ip ``11.1.89.7/24`` to eth0 @@ -22,7 +22,7 @@ Add/update additional networks ``net11`` and ``net13`` into ``networks`` table:: Define Adapters in the nics table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#. Privision ip is coming from DHCP, it is no need to configure install nic into ``nics`` table. Provision ip can be configured in node definition, but it is not must. :: +#. Provision ip is coming from DHCP, there is no need to configure install nic into ``nics`` table. Provision ip can be configured in node definition, but it is not required. :: chdef cn1 ip=11.1.89.7 @@ -66,7 +66,7 @@ Configure adapters with static IPs updatenode cn1 -P "confignetwork" -**Notes:** Option "-s" writes the install NIC's information into configuration file for persistence. All other NIC's data defined in ``nics`` table will be written also. Without option "-s", ``confignetwork`` only configure all NIC's data defined in ``nics`` table. +**Notes:** Option "-s" writes the install NIC's information into configuration file for persistence. All other NIC's data defined in ``nics`` table will be written also. Without option "-s", ``confignetwork`` only configures all NIC's data defined in ``nics`` table. Check result ~~~~~~~~~~~~ diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst index 25769c31f..74e33d59e 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst @@ -1,13 +1,13 @@ Use Extra Parameters In NIC Configuration File ---------------------------------------------- -Use ``nicextraparams`` to customize attribute in NIC configuration file. For example : +Use ``nicextraparams`` to customize attributes in NIC configuration file. For example : - #. Compute node ``cn1`` has one physical NIC: eth1 + #. Compute node ``cn1`` with one physical NIC: ``eth1`` #. Configure network into ``networks`` table, configure ``nicips``, ``nictypes`` and ``nicnetworks`` in ``nics`` table, like :doc:`Configure Ethernet Network Interface` - #. In order to customize "MTU=1456 onboot=no" for eth1. configure ``nicips``, ``nictypes`` and ``nicnetworks`` in ``nics`` table , also need to configure ``nicextraparams`` as following:: + #. In order to customize "MTU=1456 ONBOOT=no" for eth1. configure ``nicips``, ``nictypes`` and ``nicnetworks`` in ``nics`` table , also need to configure ``nicextraparams`` as following:: - chdef cn1 nicextraparams.eth1="MTU=1456 onboot=no" + chdef cn1 nicextraparams.eth1="MTU=1456 ONBOOT=no" #. After ``confignetwork`` is executed in ``cn1``, ``nicexraparams`` will overwrite the original value in ``/etc/sysconfig/network-scripts/ifcfg-eth1`` as :: diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst similarity index 98% rename from docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst rename to docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst index 32b8b5a83..45db73984 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst @@ -1,5 +1,5 @@ -Configure Additional Network Interfaces - confignics - (depleted) -================================================================= +Configure Additional Network Interfaces - confignics - (deprecated) +=================================================================== 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. 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 deleted file mode 100644 index da079510d..000000000 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst +++ /dev/null @@ -1,55 +0,0 @@ -Customize network adapter -========================= - -This section introduces how to configure network adapters with persistent configuration using xCAT. - -Networking Adapters Configuration - confignetwork -------------------------------------------------- - -The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the confignetwork postscript decides what IP address to give the secondary adapter is by checking the nics table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table: - - * ``nicips`` - * ``nictypes`` - * ``nicnetworks`` - -If configuring VLAN, BONDs, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured. - - * ``nicdevices`` - resolves the relationship among the physical network interface devices - -The following scenarios are standalone typical examples to configure Ethernet adapters/BOND/VLAN/Bridge. - - #. Configure Ethernet adapters: - - * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../common/deployment/network/cfg_network_ethernet_nic>` - To configure Ethernet install NIC or other Ethernet network adapters as static - - #. Configure BOND **[RHEL]**: - - * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../common/deployment/network/cfg_network_bond>` - - #. Configure VLAN **[RHEL]**: - - * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../common/deployment/network/cfg_network_vlan>` - * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_vlan>` - - #. Configure Bridge **[RHEL]**: - - * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../common/deployment/network/cfg_network_bridge>` - * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_bridge>` - * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../common/deployment/network/cfg_network_vlan_bridge>` - - * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../common/deployment/network/cfg_network_bond_vlan_bridge>` - - #. Advanced topics: - - * :doc:`Use Customized Scripts To Configure NIC <../../../common/deployment/network/cfg_network_custom_scripts>` - * :doc:`Use Extra Parameters In NIC Configuration File <../../../common/deployment/network/cfg_network_extra_param>` - * :doc:`Configure Aliases <../../../common/deployment/network/cfg_network_aliases>` - -Configure Additional Network Interfaces - confignics - (depleted) ------------------------------------------------------------------ - -.. toctree:: - :maxdepth: 2 - - cfg_second_adapter.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst deleted file mode 100644 index 097b8010d..000000000 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst +++ /dev/null @@ -1,2 +0,0 @@ -.. include:: ../../../common/deployment/cfg_second_adapter.rst - 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 6a99eb8ac..059b0ef6c 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 @@ -12,6 +12,6 @@ Optional means all the subitems in this page are not necessary to finish an OS d syncfile.rst additional_pkg.rst use_kernel_patch.rst - cfg_network_adapter.rst + network/index.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst new file mode 100644 index 000000000..0e78a7c61 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst @@ -0,0 +1,42 @@ +Networking Adapters Configuration - confignetwork +------------------------------------------------- + +The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the ``confignetwork`` postscript decides what IP address to give the secondary adapter is by checking the ``nics`` table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table: + + * ``nicips`` + * ``nictypes`` + * ``nicnetworks`` + +If configuring VLAN, BOND, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured. VLAN, BOND or BRIDGES is only supported on RHEL. + + * ``nicdevices`` - resolves the relationship among the physical network interface devices + +The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Bridge. + + #. Configure Ethernet adapters: + + * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../../common/deployment/network/cfg_network_ethernet_nic>` + To configure Ethernet install NIC or other Ethernet network adapters as static + + #. Configure BOND **[RHEL]**: + + * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../../common/deployment/network/cfg_network_bond>` + + #. Configure VLAN **[RHEL]**: + + * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../../common/deployment/network/cfg_network_vlan>` + * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_vlan>` + + #. Configure Bridge **[RHEL]**: + + * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../../common/deployment/network/cfg_network_bridge>` + * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_bridge>` + * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../../common/deployment/network/cfg_network_vlan_bridge>` + + * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../../common/deployment/network/cfg_network_bond_vlan_bridge>` + + #. Advanced topics: + + * :doc:`Use Customized Scripts To Configure NIC <../../../../common/deployment/network/cfg_network_custom_scripts>` + * :doc:`Use Extra Parameters In NIC Configuration File <../../../../common/deployment/network/cfg_network_extra_param>` + * :doc:`Configure Aliases <../../../../common/deployment/network/cfg_network_aliases>` diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter.rst new file mode 100644 index 000000000..f5cfbee00 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter.rst @@ -0,0 +1,2 @@ +.. include:: ../../../../common/deployment/network/cfg_second_adapter.rst + diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst new file mode 100644 index 000000000..43286943d --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst @@ -0,0 +1,10 @@ +Customize network adapter +========================= + +This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. + +.. toctree:: + :maxdepth: 1 + + cfg_network_adapter.rst + cfg_second_adapter.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 deleted file mode 100644 index da079510d..000000000 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst +++ /dev/null @@ -1,55 +0,0 @@ -Customize network adapter -========================= - -This section introduces how to configure network adapters with persistent configuration using xCAT. - -Networking Adapters Configuration - confignetwork -------------------------------------------------- - -The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the confignetwork postscript decides what IP address to give the secondary adapter is by checking the nics table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table: - - * ``nicips`` - * ``nictypes`` - * ``nicnetworks`` - -If configuring VLAN, BONDs, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured. - - * ``nicdevices`` - resolves the relationship among the physical network interface devices - -The following scenarios are standalone typical examples to configure Ethernet adapters/BOND/VLAN/Bridge. - - #. Configure Ethernet adapters: - - * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../common/deployment/network/cfg_network_ethernet_nic>` - To configure Ethernet install NIC or other Ethernet network adapters as static - - #. Configure BOND **[RHEL]**: - - * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../common/deployment/network/cfg_network_bond>` - - #. Configure VLAN **[RHEL]**: - - * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../common/deployment/network/cfg_network_vlan>` - * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_vlan>` - - #. Configure Bridge **[RHEL]**: - - * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../common/deployment/network/cfg_network_bridge>` - * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_bridge>` - * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../common/deployment/network/cfg_network_vlan_bridge>` - - * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../common/deployment/network/cfg_network_bond_vlan_bridge>` - - #. Advanced topics: - - * :doc:`Use Customized Scripts To Configure NIC <../../../common/deployment/network/cfg_network_custom_scripts>` - * :doc:`Use Extra Parameters In NIC Configuration File <../../../common/deployment/network/cfg_network_extra_param>` - * :doc:`Configure Aliases <../../../common/deployment/network/cfg_network_aliases>` - -Configure Additional Network Interfaces - confignics - (depleted) ------------------------------------------------------------------ - -.. toctree:: - :maxdepth: 2 - - cfg_second_adapter.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst deleted file mode 100644 index 097b8010d..000000000 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst +++ /dev/null @@ -1,2 +0,0 @@ -.. include:: ../../../common/deployment/cfg_second_adapter.rst - 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 c790d1dd3..5d71d4223 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_network_adapter.rst + network/index.rst enable_kdump.rst install_new_kernel.rst acc_initrd_rootimg_gen_ppc64le.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst new file mode 100644 index 000000000..0e78a7c61 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst @@ -0,0 +1,42 @@ +Networking Adapters Configuration - confignetwork +------------------------------------------------- + +The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the ``confignetwork`` postscript decides what IP address to give the secondary adapter is by checking the ``nics`` table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table: + + * ``nicips`` + * ``nictypes`` + * ``nicnetworks`` + +If configuring VLAN, BOND, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured. VLAN, BOND or BRIDGES is only supported on RHEL. + + * ``nicdevices`` - resolves the relationship among the physical network interface devices + +The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Bridge. + + #. Configure Ethernet adapters: + + * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../../common/deployment/network/cfg_network_ethernet_nic>` + To configure Ethernet install NIC or other Ethernet network adapters as static + + #. Configure BOND **[RHEL]**: + + * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../../common/deployment/network/cfg_network_bond>` + + #. Configure VLAN **[RHEL]**: + + * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../../common/deployment/network/cfg_network_vlan>` + * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_vlan>` + + #. Configure Bridge **[RHEL]**: + + * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../../common/deployment/network/cfg_network_bridge>` + * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_bridge>` + * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../../common/deployment/network/cfg_network_vlan_bridge>` + + * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../../common/deployment/network/cfg_network_bond_vlan_bridge>` + + #. Advanced topics: + + * :doc:`Use Customized Scripts To Configure NIC <../../../../common/deployment/network/cfg_network_custom_scripts>` + * :doc:`Use Extra Parameters In NIC Configuration File <../../../../common/deployment/network/cfg_network_extra_param>` + * :doc:`Configure Aliases <../../../../common/deployment/network/cfg_network_aliases>` diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter.rst new file mode 100644 index 000000000..f5cfbee00 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter.rst @@ -0,0 +1,2 @@ +.. include:: ../../../../common/deployment/network/cfg_second_adapter.rst + diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst new file mode 100644 index 000000000..43286943d --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst @@ -0,0 +1,10 @@ +Customize network adapter +========================= + +This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. + +.. toctree:: + :maxdepth: 1 + + cfg_network_adapter.rst + cfg_second_adapter.rst