From 88323b74009e1b1dfd33732f97f6a76bd973b13d Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Thu, 2 Mar 2017 14:05:11 -0500 Subject: [PATCH] Final review changes --- .../common/deployment/cfg_network.rst | 2 ++ .../common/deployment/cfg_network_bond.rst | 2 +- .../common/deployment/cfg_network_vlan.rst | 16 +++------------- 3 files changed, 6 insertions(+), 14 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 c36c0e3c2..e11d21d67 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,6 +1,8 @@ Advanced Networking Configuration - confignetwork ================================================= +**Note:** ``confignetwork`` postscript is only supported on RHEL releases. + .. toctree:: :maxdepth: 2 diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_bond.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_bond.rst index 5bf46b9db..b4c31a981 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_bond.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_bond.rst @@ -27,7 +27,7 @@ Add network object into the networks table Use the ``chdef`` command to add/modify the networks in the ``networks`` table :: - chdef -t network net40 net=40.0.0.0 mask=255.0.0.0 mgtifname=eth1 + chdef -t network net40 net=40.0.0.0 mask=255.0.0.0 chdef cn1 nicnetworks.bond0=net40 Add ``confignetwork`` into the node's postscripts list diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_vlan.rst index a245ff172..3ddd9606f 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_vlan.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_vlan.rst @@ -19,7 +19,7 @@ The following example set the xCAT properties for compute node ``cn1`` to achiev Define attributes in the ``nics`` table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Chose one of three methods described below: +Chose one of two methods described below: #. Using the ``mkdef`` or ``chdef`` commands @@ -83,16 +83,6 @@ Chose one of three methods described below: 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. - - 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,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",, - Define the additional networks to xCAT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -103,8 +93,8 @@ 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 + chdef -t network net10 net=10.0.0.0 mask=255.0.0.0 + chdef -t network net20 net=20.0.0.0 mask=255.0.0.0 Add ``confignetwork`` into the node's postscripts list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~