From 462af566a2c3a4b1d9cd777dfd74423e7e24b57c Mon Sep 17 00:00:00 2001 From: ertaozh Date: Tue, 10 Apr 2018 23:07:39 -0400 Subject: [PATCH 1/2] Update doc about ondiscover and bmcvlantag --- .../discovery/mtms/discovery_using_defined.rst | 11 +++++++++++ .../ppc64le/discovery/mtms/discovery_using_dhcp.rst | 6 ++++++ .../ppc64le/discovery/seq_discovery.rst | 12 ++++++++++++ .../ppc64le/discovery/switch_discovery.rst | 13 +++++++++++++ 4 files changed, 42 insertions(+) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst index 1eb2d3d68..672e584ed 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst @@ -101,6 +101,12 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi chdef cn01 chain="runcmd=bmcsetup" +#. **[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used. + + For example, configure console and copy SSH key for **OpenBMC** :: + + chdef cn01 -p chain=ondiscover="makegocons|rspconfig:sshcfg" + #. Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. :: chdef cn01 -p chain="osimage=" @@ -113,6 +119,11 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi chdef cn01 bmc=50.0.101.1 + **[Optional]** If more configuration planed to be done on BMC, the following command is also needed. :: + + chdef cn01 bmcvlantag= # tag VLAN ID for BMC + chdef cn01 bmcusername= + chdef cn01 bmcpassword= #. Add the compute node IP information to ``/etc/hosts``: :: diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst index b5e083ef7..e33ac0939 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst @@ -85,6 +85,12 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to chdef cn01 chain="runcmd=bmcsetup" +#. **[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used. + + For example, configure console and copy SSH key for **OpenBMC** :: + + chdef cn01 -p chain=ondiscover="makegocons|rspconfig:sshcfg" + #. Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. :: chdef cn01 -p chain="osimage=" diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst index 7ec0f41cf..5751d9c0e 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst @@ -18,10 +18,22 @@ Predefine a group of nodes with desired IP address for host and IP address for F nodeadd cn1 groups=powerLE,all chdef cn1 mgt=ipmi cons=ipmi ip=10.0.101.1 bmc=50.0.101.1 netboot=petitboot installnic=mac primarynic=mac +**[Optional]** If more configuration planed to be done on BMC, the following command is also needed. :: + + chdef cn1 bmcvlantag= # tag VLAN ID for BMC + chdef cn1 bmcusername= + chdef cn1 bmcpassword= + In order to do BMC configuration during the discovery process, set ``runcmd=bmcsetup``. :: chdef cn1 chain="runcmd=bmcsetup" +**[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used. + + For example, configure console and copy SSH key for **OpenBMC** :: + + chdef cn1 -p chain=ondiscover="makegocons|rspconfig:sshcfg" + Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. :: chdef cn1 -p chain="osimage=" diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst index cb5c2d9f4..206a48306 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst @@ -54,10 +54,23 @@ After switches are defined, the server node can be predefined with the following chdef cn1 mgt=ipmi cons=ipmi ip=10.0.101.1 bmc=50.0.101.1 netboot=petitboot installnic=mac primarynic=mac chdef cn1 switch=switch1 switchport=0 + +**[Optional]** If more configuration planed to be done on BMC, the following command is also needed. :: + + chdef cn1 bmcvlantag= # tag VLAN ID for BMC + chdef cn1 bmcusername= + chdef cn1 bmcpassword= + In order to do BMC configuration during the discovery process, set ``runcmd=bmcsetup``. :: chdef cn1 chain="runcmd=bmcsetup" +**[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used. + + For example, configure console and copy SSH key for **OpenBMC** :: + + chdef cn01 -p chain=ondiscover="makegocons|rspconfig:sshcfg" + Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. :: chdef cn1 -p chain="osimage=" From 4f8b769ba31c32203d1500792e158a371781a91a Mon Sep 17 00:00:00 2001 From: ertaozh Date: Thu, 12 Apr 2018 05:52:22 -0400 Subject: [PATCH 2/2] update document to add powersupplyredundancy for ondiscover --- .../ppc64le/discovery/mtms/discovery_using_defined.rst | 6 ++++-- .../ppc64le/discovery/mtms/discovery_using_dhcp.rst | 6 ++++-- .../manage_clusters/ppc64le/discovery/seq_discovery.rst | 6 ++++-- .../manage_clusters/ppc64le/discovery/switch_discovery.rst | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst index 672e584ed..26042970c 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst @@ -103,9 +103,11 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi #. **[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used. - For example, configure console and copy SSH key for **OpenBMC** :: + For example, configure console, copy SSH key for **OpenBMC**, then disable ``powersupplyredundancy`` :: - chdef cn01 -p chain=ondiscover="makegocons|rspconfig:sshcfg" + chdef cn01 -p chain="ondiscover=makegocons|rspconfig:sshcfg|rspconfig:powersupplyredundancy=disabled" + + **Note**: ``|`` is used to split commands, and ``:`` is used to split command with its option. #. Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. :: diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst index e33ac0939..17a7843c9 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst @@ -87,9 +87,11 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to #. **[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used. - For example, configure console and copy SSH key for **OpenBMC** :: + For example, configure console, copy SSH key for **OpenBMC**, then disable ``powersupplyredundancy`` :: - chdef cn01 -p chain=ondiscover="makegocons|rspconfig:sshcfg" + chdef cn01 -p chain="ondiscover=makegocons|rspconfig:sshcfg|rspconfig:powersupplyredundancy=disabled" + + **Note**: ``|`` is used to split commands, and ``:`` is used to split command with its option. #. Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. :: diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst index 5751d9c0e..aea009420 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst @@ -30,9 +30,11 @@ In order to do BMC configuration during the discovery process, set ``runcmd=bmcs **[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used. - For example, configure console and copy SSH key for **OpenBMC** :: + For example, configure console, copy SSH key for **OpenBMC**, then disable ``powersupplyredundancy`` :: - chdef cn1 -p chain=ondiscover="makegocons|rspconfig:sshcfg" + chdef cn01 -p chain="ondiscover=makegocons|rspconfig:sshcfg|rspconfig:powersupplyredundancy=disabled" + + **Note**: ``|`` is used to split commands, and ``:`` is used to split command with its option. Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. :: diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst index 206a48306..ffa679488 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst @@ -67,9 +67,11 @@ In order to do BMC configuration during the discovery process, set ``runcmd=bmcs **[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used. - For example, configure console and copy SSH key for **OpenBMC** :: + For example, configure console, copy SSH key for **OpenBMC**, then disable ``powersupplyredundancy`` :: - chdef cn01 -p chain=ondiscover="makegocons|rspconfig:sshcfg" + chdef cn01 -p chain="ondiscover=makegocons|rspconfig:sshcfg|rspconfig:powersupplyredundancy=disabled" + + **Note**: ``|`` is used to split commands, and ``:`` is used to split command with its option. Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. ::