From 541989253c4a32baf2392e03a5bdb87495e8a4e7 Mon Sep 17 00:00:00 2001 From: egoncalv Date: Tue, 27 Jul 2021 16:29:46 -0300 Subject: [PATCH] Install guide issues Worked on bugs Fixed upstream command and added partner only Applied same updates to other install guides as requested Applied updated to r6_release Fixed indentation Applied requested changes in commands Signed-off-by: egoncalv Change-Id: I7bca7253c288e335d035a621afdb86e3790ebb55 --- .../aio_duplex_install_kubernetes.rest | 5 ++ .../aio_simplex_install_kubernetes.rest | 2 + .../rook_storage_install_kubernetes.rest | 2 + .../aio_duplex_install_kubernetes.rst | 82 ++++++++++--------- .../aio_simplex_install_kubernetes.rst | 39 +++++---- .../rook_storage_install_kubernetes.rst | 21 +++-- .../aio_duplex_install_kubernetes.rst | 74 +++++++++-------- .../aio_simplex_install_kubernetes.rst | 34 +++++--- .../rook_storage_install_kubernetes.rst | 22 +++-- 9 files changed, 167 insertions(+), 114 deletions(-) create mode 100644 doc/source/_includes/aio_duplex_install_kubernetes.rest create mode 100644 doc/source/_includes/aio_simplex_install_kubernetes.rest create mode 100644 doc/source/_includes/rook_storage_install_kubernetes.rest diff --git a/doc/source/_includes/aio_duplex_install_kubernetes.rest b/doc/source/_includes/aio_duplex_install_kubernetes.rest new file mode 100644 index 000000000..96a229072 --- /dev/null +++ b/doc/source/_includes/aio_duplex_install_kubernetes.rest @@ -0,0 +1,5 @@ +.. ref1-begin +.. ref1-end + +.. ref2-begin +.. ref2-end diff --git a/doc/source/_includes/aio_simplex_install_kubernetes.rest b/doc/source/_includes/aio_simplex_install_kubernetes.rest new file mode 100644 index 000000000..1a7b66ba9 --- /dev/null +++ b/doc/source/_includes/aio_simplex_install_kubernetes.rest @@ -0,0 +1,2 @@ +.. ref1-begin +.. ref1-end diff --git a/doc/source/_includes/rook_storage_install_kubernetes.rest b/doc/source/_includes/rook_storage_install_kubernetes.rest new file mode 100644 index 000000000..1a7b66ba9 --- /dev/null +++ b/doc/source/_includes/rook_storage_install_kubernetes.rest @@ -0,0 +1,2 @@ +.. ref1-begin +.. ref1-end diff --git a/doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst index d64b3ce1d..02c853d69 100644 --- a/doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst @@ -227,11 +227,11 @@ Configure controller-0 ethernet port. Use the |OAM| port name that is applicable to your deployment environment, for example eth0: -.. code-block:: bash + .. code-block:: bash - OAM_IF= - system host-if-modify controller-0 $OAM_IF -c platform - system interface-network-assign controller-0 $OAM_IF oam + OAM_IF= + system host-if-modify controller-0 $OAM_IF -c platform + system interface-network-assign controller-0 $OAM_IF oam To configure a vlan or aggregated ethernet interface, see :ref:`Node Interfaces `. @@ -264,7 +264,7 @@ Configure controller-0 system ntp-modify ntpservers=0.pool.ntp.org,1.pool.ntp.org - To configure |PTP| instead of |NTP|, see ref:`PTP Server Configuration + To configure |PTP| instead of |NTP|, see :ref:`PTP Server Configuration `. .. only:: openstack @@ -281,12 +281,20 @@ Configure controller-0 #. **For OpenStack only:** Assign OpenStack host labels to controller-0 in support of installing the stx-openstack manifest and helm-charts later. - :: + .. only:: starlingx - system host-label-assign controller-0 openstack-control-plane=enabled - system host-label-assign controller-0 openstack-compute-node=enabled - system host-label-assign controller-0 openvswitch=enabled - system host-label-assign controller-0 sriov=enabled + :: + + system host-label-assign controller-0 openstack-control-plane=enabled + system host-label-assign controller-0 openstack-compute-node=enabled + system host-label-assign controller-0 openvswitch=enabled + system host-label-assign controller-0 sriov=enabled + + .. only:: partner + + .. include:: /_includes/aio_duplex_install_kubernetes.rest + :start-after: ref1-begin + :end-before: ref1-end #. **For OpenStack only:** Due to the additional openstack services running on the |AIO| controller platform cores, a minimum of 4 platform cores are @@ -306,9 +314,9 @@ Configure controller-0 .. code-block:: bash # check existing size of docker fs - system host-fs-list controller-1 + system host-fs-list controller-0 # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located - system host-lvg-list controller-1 + system host-lvg-list controller-0 # if existing docker fs size + cgts-vg available space is less than 60G, # you will need to add a new disk partition to cgts-vg @@ -316,22 +324,22 @@ Configure controller-0 # ( if not use another unused disk ) # Get device path of ROOT DISK - system host-show controller-1 --nowrap | fgrep rootfs + system host-show controller-0 --nowrap | fgrep rootfs # Get UUID of ROOT DISK by listing disks - system host-disk-list controller-1 + system host-disk-list controller-0 # Create new PARTITION on ROOT DISK, and take note of new partition’s ‘uuid’ in response # Use a partition size such that you’ll be able to increase docker fs size from 30G to 60G PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol controller-1 ${PARTITION_SIZE} + system system host-disk-partition-add -t lvm_phys_vol controller-0 ${PARTITION_SIZE} # Add new partition to ‘cgts-vg’ local volume group - system host-pv-add controller-1 cgts-vg + system host-pv-add controller-0 cgts-vg sleep 2 # wait for partition to be added # Increase docker filesystem to 60G - system host-fs-modify controller-1 docker=60 + system host-fs-modify controller-0 docker=60 #. **For OpenStack only:** Configure the system setting for the vSwitch. @@ -445,7 +453,7 @@ Configure controller-0 # root disk, if that is what you chose above. # Additional PARTITION(s) from additional disks can be added later if required. PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} + system host-disk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} # Add new partition to ‘nova-local’ local volume group system host-pv-add ${NODE} nova-local @@ -484,8 +492,6 @@ Configure controller-0 # Create Data Networks that vswitch 'data' interfaces will be connected to DATANET0='datanet0' DATANET1='datanet1' - system datanetwork-add ${DATANET0} vlan - system datanetwork-add ${DATANET1} vlan # Assign Data Networks to Data Interfaces system interface-datanetwork-assign ${NODE} ${DATANET0} @@ -599,11 +605,7 @@ For host-based Ceph: # List OSD storage devices system host-stor-list controller-0 - - # Add disk as an OSD storage - system host-stor-add controller-0 osd - -.. only:: starlingx + .. only:: starlingx For Rook container-based Ceph: @@ -720,12 +722,20 @@ Configure controller-1 #. **For OpenStack only:** Assign OpenStack host labels to controller-1 in support of installing the |prefix|-openstack manifest and helm-charts later. - :: + .. only:: starlingx - system host-label-assign controller-1 openstack-control-plane=enabled - system host-label-assign controller-1 openstack-compute-node=enabled - system host-label-assign controller-1 openvswitch=enabled - system host-label-assign controller-1 sriov=enabled + :: + + system host-label-assign controller-1 openstack-control-plane=enabled + system host-label-assign controller-1 openstack-compute-node=enabled + system host-label-assign controller-1 openvswitch=enabled + system host-label-assign controller-1 sriov=enabled + + .. only:: partner + + .. include:: /_includes/aio_duplex_install_kubernetes.rest + :start-after: ref2-begin + :end-before: ref2-end #. **For OpenStack only:** Due to the additional openstack services running on the |AIO| controller platform cores, a minimum of 4 platform cores are @@ -826,6 +836,8 @@ Configure controller-1 .. code-block:: bash + export NODE=controller-1 + # Create ‘nova-local’ local volume group system host-lvg-add ${NODE} nova-local @@ -847,7 +859,7 @@ Configure controller-1 # Additional PARTITION(s) from additional disks can be added later if required. PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} + system host-disk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} # Add new partition to ‘nova-local’ local volume group system host-pv-add ${NODE} nova-local @@ -885,8 +897,6 @@ Configure controller-1 # Create Data Networks that vswitch 'data' interfaces will be connected to DATANET0='datanet0' DATANET1='datanet1' - system datanetwork-add ${DATANET0} vlan - system datanetwork-add ${DATANET1} vlan # Assign Data Networks to Data Interfaces system interface-datanetwork-assign ${NODE} ${DATANET0} @@ -932,8 +942,6 @@ Optionally Configure PCI-SRIOV Interfaces # will be connected to DATANET0='datanet0' DATANET1='datanet1' - system datanetwork-add ${DATANET0} vlan - system datanetwork-add ${DATANET1} vlan # Assign Data Networks to PCI-SRIOV Interfaces system interface-datanetwork-assign ${NODE} ${DATANET0} @@ -982,10 +990,6 @@ For host-based Ceph: # List OSD storage devices system host-stor-list controller-1 - # Add disk as an OSD storage - system host-stor-add controller-1 osd - - .. only:: starlingx For Rook container-based Ceph: diff --git a/doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst index 687aa8c10..995091014 100644 --- a/doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst @@ -232,8 +232,8 @@ The newly installed controller needs to be configured. system host-if-modify controller-0 $OAM_IF -c platform system interface-network-assign controller-0 $OAM_IF oam - To configure a vlan or aggregated ethernet interface, see :ref:`Node - Interfaces `. + To configure a vlan or aggregated ethernet interface, see :ref:`Node + Interfaces `. #. Configure |NTP| servers for network time synchronization: :: @@ -259,12 +259,21 @@ The newly installed controller needs to be configured. #. **For OpenStack only:** Assign OpenStack host labels to controller-0 in support of installing the stx-openstack manifest and helm-charts later. - :: - system host-label-assign controller-0 openstack-control-plane=enabled - system host-label-assign controller-0 openstack-compute-node=enabled - system host-label-assign controller-0 openvswitch=enabled - system host-label-assign controller-0 sriov=enabled + .. only:: starlingx + + :: + + system host-label-assign controller-0 openstack-control-plane=enabled + system host-label-assign controller-0 openstack-compute-node=enabled + system host-label-assign controller-0 openvswitch=enabled + system host-label-assign controller-0 sriov=enabled + + .. only:: partner + + .. include:: /_includes/aio_simplex_install_kubernetes.rest + :start-after: ref1-begin + :end-before: ref1-end #. **For OpenStack only:** Due to the additional openstack services running on the |AIO| controller platform cores, a minimum of 4 platform cores are @@ -284,9 +293,9 @@ The newly installed controller needs to be configured. .. code-block:: bash # check existing size of docker fs - system host-fs-list controller-1 + system host-fs-list controller-0 # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located - system host-lvg-list controller-1 + system host-lvg-list controller-0 # if existing docker fs size + cgts-vg available space is less than 60G, # you will need to add a new disk partition to cgts-vg @@ -294,22 +303,22 @@ The newly installed controller needs to be configured. # ( if not use another unused disk ) # Get device path of ROOT DISK - system host-show controller-1 --nowrap | fgrep rootfs + system host-show controller-0 --nowrap | fgrep rootfs # Get UUID of ROOT DISK by listing disks - system host-disk-list controller-1 + system host-disk-list controller-0 # Create new PARTITION on ROOT DISK, and take note of new partition’s ‘uuid’ in response # Use a partition size such that you’ll be able to increase docker fs size from 30G to 60G PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol controller-1 ${PARTITION_SIZE} + system hostdisk-partition-add -t lvm_phys_vol controller-0 ${PARTITION_SIZE} # Add new partition to ‘cgts-vg’ local volume group - system host-pv-add controller-1 cgts-vg + system host-pv-add controller-0 cgts-vg sleep 2 # wait for partition to be added # Increase docker filesystem to 60G - system host-fs-modify controller-1 docker=60 + system host-fs-modify controller-0 docker=60 #. **For OpenStack only:** Configure the system setting for the vSwitch. @@ -420,7 +429,7 @@ The newly installed controller needs to be configured. # Additional PARTITION(s) from additional disks can be added later if required. PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} + system host-disk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} # Add new partition to ‘nova-local’ local volume group system host-pv-add ${NODE} nova-local diff --git a/doc/source/deploy_install_guides/r5_release/bare_metal/rook_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/bare_metal/rook_storage_install_kubernetes.rst index cb558061c..16fb3114c 100644 --- a/doc/source/deploy_install_guides/r5_release/bare_metal/rook_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/bare_metal/rook_storage_install_kubernetes.rst @@ -588,13 +588,22 @@ OpenStack-specific host configuration #. **For OpenStack only:** Assign OpenStack host labels to the worker nodes in support of installing the stx-openstack manifest and helm-charts later. - .. code-block:: bash - for NODE in worker-0 worker-1; do - system host-label-assign $NODE openstack-compute-node=enabled - system host-label-assign $NODE openvswitch=enabled - system host-label-assign $NODE sriov=enabled - done + .. only:: starlingx + + .. code-block:: bash + + for NODE in worker-0 worker-1; do + system host-label-assign $NODE openstack-compute-node=enabled + system host-label-assign $NODE openvswitch=enabled + system host-label-assign $NODE sriov=enabled + done + + .. only:: partner + + .. include:: /_includes/rook_storage_install_kubernetes.rest + :start-after: ref1-begin + :end-before: ref1-end #. **For OpenStack only:** Set up disk partition for nova-local volume group, which is needed for stx-openstack nova ephemeral disks. diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_install_kubernetes.rst index a07e94ee0..f0e5c8617 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_install_kubernetes.rst @@ -264,8 +264,8 @@ Configure controller-0 system ntp-modify ntpservers=0.pool.ntp.org,1.pool.ntp.org - To configure |PTP| instead of |NTP|, see ref:`PTP Server Configuration - `. + To configure |PTP| instead of |NTP|, see :ref:`PTP Server Configuration + `. .. only:: openstack @@ -281,12 +281,20 @@ Configure controller-0 #. **For OpenStack only:** Assign OpenStack host labels to controller-0 in support of installing the stx-openstack manifest and helm-charts later. - :: + .. only:: starlingx - system host-label-assign controller-0 openstack-control-plane=enabled - system host-label-assign controller-0 openstack-compute-node=enabled - system host-label-assign controller-0 openvswitch=enabled - system host-label-assign controller-0 sriov=enabled + :: + + system host-label-assign controller-0 openstack-control-plane=enabled + system host-label-assign controller-0 openstack-compute-node=enabled + system host-label-assign controller-0 openvswitch=enabled + system host-label-assign controller-0 sriov=enabled + + .. only:: partner + + .. include:: /_includes/aio_duplex_install_kubernetes.rest + :start-after: ref1-begin + :end-before: ref1-end #. **For OpenStack only:** Due to the additional openstack services running on the |AIO| controller platform cores, a minimum of 4 platform cores are @@ -306,9 +314,9 @@ Configure controller-0 .. code-block:: bash # check existing size of docker fs - system host-fs-list controller-1 + system host-fs-list controller-0 # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located - system host-lvg-list controller-1 + system host-lvg-list controller-0 # if existing docker fs size + cgts-vg available space is less than 60G, # you will need to add a new disk partition to cgts-vg @@ -316,22 +324,22 @@ Configure controller-0 # ( if not use another unused disk ) # Get device path of ROOT DISK - system host-show controller-1 --nowrap | fgrep rootfs + system host-show controller-0 --nowrap | fgrep rootfs # Get UUID of ROOT DISK by listing disks - system host-disk-list controller-1 + system host-disk-list controller-0 # Create new PARTITION on ROOT DISK, and take note of new partition’s ‘uuid’ in response # Use a partition size such that you’ll be able to increase docker fs size from 30G to 60G PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol controller-1 ${PARTITION_SIZE} + system host-disk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} # Add new partition to ‘cgts-vg’ local volume group - system host-pv-add controller-1 cgts-vg + system host-pv-add controller-0 cgts-vg sleep 2 # wait for partition to be added # Increase docker filesystem to 60G - system host-fs-modify controller-1 docker=60 + system host-fs-modify controller-0 docker=60 #. **For OpenStack only:** Configure the system setting for the vSwitch. @@ -449,7 +457,7 @@ Configure controller-0 # Additional PARTITION(s) from additional disks can be added later if required. PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} + system host-disk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} # Add new partition to ‘nova-local’ local volume group system host-pv-add ${NODE} nova-local @@ -603,10 +611,6 @@ For host-based Ceph: # List OSD storage devices system host-stor-list controller-0 - - # Add disk as an OSD storage - system host-stor-add controller-0 osd - .. only:: starlingx For Rook container-based Ceph: @@ -724,12 +728,20 @@ Configure controller-1 #. **For OpenStack only:** Assign OpenStack host labels to controller-1 in support of installing the |prefix|-openstack manifest and helm-charts later. - :: + .. only:: starlingx - system host-label-assign controller-1 openstack-control-plane=enabled - system host-label-assign controller-1 openstack-compute-node=enabled - system host-label-assign controller-1 openvswitch=enabled - system host-label-assign controller-1 sriov=enabled + :: + + system host-label-assign controller-1 openstack-control-plane=enabled + system host-label-assign controller-1 openstack-compute-node=enabled + system host-label-assign controller-1 openvswitch=enabled + system host-label-assign controller-1 sriov=enabled + + .. only:: partner + + .. include:: /_includes/aio_duplex_install_kubernetes.rest + :start-after: ref2-begin + :end-before: ref2-end #. **For OpenStack only:** Due to the additional openstack services running on the |AIO| controller platform cores, a minimum of 4 platform cores are @@ -832,6 +844,8 @@ Configure controller-1 .. code-block:: bash + export NODE=controller-1 + # Create ‘nova-local’ local volume group system host-lvg-add ${NODE} nova-local @@ -853,7 +867,7 @@ Configure controller-1 # Additional PARTITION(s) from additional disks can be added later if required. PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} + system host-disk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} # Add new partition to ‘nova-local’ local volume group system host-pv-add ${NODE} nova-local @@ -891,8 +905,6 @@ Configure controller-1 # Create Data Networks that vswitch 'data' interfaces will be connected to DATANET0='datanet0' DATANET1='datanet1' - system datanetwork-add ${DATANET0} vlan - system datanetwork-add ${DATANET1} vlan # Assign Data Networks to Data Interfaces system interface-datanetwork-assign ${NODE} ${DATANET0} @@ -938,8 +950,6 @@ Optionally Configure PCI-SRIOV Interfaces # will be connected to DATANET0='datanet0' DATANET1='datanet1' - system datanetwork-add ${DATANET0} vlan - system datanetwork-add ${DATANET1} vlan # Assign Data Networks to PCI-SRIOV Interfaces system interface-datanetwork-assign ${NODE} ${DATANET0} @@ -988,11 +998,7 @@ For host-based Ceph: # List OSD storage devices system host-stor-list controller-1 - # Add disk as an OSD storage - system host-stor-add controller-1 osd - - -.. only:: starlingx + .. only:: starlingx For Rook container-based Ceph: diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_install_kubernetes.rst index f6c933e89..507ee63c9 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_install_kubernetes.rst @@ -259,12 +259,20 @@ The newly installed controller needs to be configured. #. **For OpenStack only:** Assign OpenStack host labels to controller-0 in support of installing the stx-openstack manifest and helm-charts later. - :: + .. only:: starlingx - system host-label-assign controller-0 openstack-control-plane=enabled - system host-label-assign controller-0 openstack-compute-node=enabled - system host-label-assign controller-0 openvswitch=enabled - system host-label-assign controller-0 sriov=enabled + :: + + system host-label-assign controller-0 openstack-control-plane=enabled + system host-label-assign controller-0 openstack-compute-node=enabled + system host-label-assign controller-0 openvswitch=enabled + system host-label-assign controller-0 sriov=enabled + + .. only:: partner + + .. include:: /_includes/aio_simplex_install_kubernetes.rest + :start-after: ref1-begin + :end-before: ref1-end #. **For OpenStack only:** Due to the additional openstack services running on the |AIO| controller platform cores, a minimum of 4 platform cores are @@ -284,9 +292,9 @@ The newly installed controller needs to be configured. .. code-block:: bash # check existing size of docker fs - system host-fs-list controller-1 + system host-fs-list controller-0 # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located - system host-lvg-list controller-1 + system host-lvg-list controller-0 # if existing docker fs size + cgts-vg available space is less than 60G, # you will need to add a new disk partition to cgts-vg @@ -294,22 +302,22 @@ The newly installed controller needs to be configured. # ( if not use another unused disk ) # Get device path of ROOT DISK - system host-show controller-1 --nowrap | fgrep rootfs + system host-show controller-0 --nowrap | fgrep rootfs # Get UUID of ROOT DISK by listing disks - system host-disk-list controller-1 + system host-disk-list controller-0 # Create new PARTITION on ROOT DISK, and take note of new partition’s ‘uuid’ in response # Use a partition size such that you’ll be able to increase docker fs size from 30G to 60G PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol controller-1 ${PARTITION_SIZE} + system hostdisk-partition-add -t lvm_phys_vol controller-0 ${PARTITION_SIZE} # Add new partition to ‘cgts-vg’ local volume group - system host-pv-add controller-1 cgts-vg + system host-pv-add controller-0 cgts-vg sleep 2 # wait for partition to be added # Increase docker filesystem to 60G - system host-fs-modify controller-1 docker=60 + system host-fs-modify controller-0 docker=60 #. **For OpenStack only:** Configure the system setting for the vSwitch. @@ -419,7 +427,7 @@ The newly installed controller needs to be configured. # Additional PARTITION(s) from additional disks can be added later if required. PARTITION_SIZE=30 - system hostdisk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} + system host-disk-partition-add -t lvm_phys_vol ${NODE} ${PARTITION_SIZE} # Add new partition to ‘nova-local’ local volume group system host-pv-add ${NODE} nova-local diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_install_kubernetes.rst index 6ee7fd0f4..e795c87ee 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_install_kubernetes.rst @@ -118,7 +118,7 @@ Bootstrap system on controller-0 as shown in the example below. Use the OAM IP SUBNET and IP ADDRESSing applicable to your deployment environment. - .. code-block:: bash + :: cd ~ cat < localhost.yml @@ -589,13 +589,21 @@ OpenStack-specific host configuration #. **For OpenStack only:** Assign OpenStack host labels to the worker nodes in support of installing the stx-openstack manifest and helm-charts later. - :: + .. only:: starlingx - for NODE in worker-0 worker-1; do - system host-label-assign $NODE openstack-compute-node=enabled - system host-label-assign $NODE openvswitch=enabled - system host-label-assign $NODE sriov=enabled - done + .. code-block:: bash + + for NODE in worker-0 worker-1; do + system host-label-assign $NODE openstack-compute-node=enabled + system host-label-assign $NODE openvswitch=enabled + system host-label-assign $NODE sriov=enabled + done + + .. only:: partner + + .. include:: /_includes/rook_storage_install_kubernetes.rest + :start-after: ref1-begin + :end-before: ref1-end #. **For OpenStack only:** Set up disk partition for nova-local volume group, which is needed for stx-openstack nova ephemeral disks.