From 7f26bf918e47fac3655286d7cafe5238c456047d Mon Sep 17 00:00:00 2001 From: Ron Stone Date: Fri, 14 May 2021 11:24:24 -0400 Subject: [PATCH] Yaml indentation corrections Corrected indentation in private docker yaml codeblock x 3. Fixed merge conflicts Added 2x spaces before defaults: clause in yaml block Signed-off-by: Ron Stone Change-Id: I8c36f84e220666012e477b9c1936437a13e1230d Signed-off-by: Ron Stone --- .../aio_duplex_install_kubernetes.rst | 44 +++++++++---------- .../aio_simplex_install_kubernetes.rst | 22 +++++----- .../controller_storage_install_kubernetes.rst | 14 +++--- 3 files changed, 40 insertions(+), 40 deletions(-) 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 e9385015e..86c068c6b 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 @@ -374,25 +374,25 @@ Configure controller-0 system host-pv-add ${NODE} nova-local ${NOVA_PARTITION_UUID} sleep 2 - #. **For OpenStack only:** Configure data interfaces for controller-0. + #. **For OpenStack only:** Configure data interfaces for controller-0. Data class interfaces are vswitch interfaces used by vswitch to provide - VM virtio vNIC connectivity to OpenStack Neutron Tenant Networks on the + VM virtio vNIC connectivity to OpenStack Neutron Tenant Networks on the underlying assigned Data Network. - + .. important:: - + A compute-labeled All-in-one controller host **MUST** have at least one Data class interface. - + * Configure the data interfaces for controller-0. - + :: - + export NODE=controller-0 - + # List inventoried host’s ports and identify ports to be used as ‘data’ interfaces, # based on displayed linux port name, pci address and device type. system host-port-list ${NODE} - + # List host’s auto-configured ‘ethernet’ interfaces, # find the interfaces corresponding to the ports identified in previous step, and # take note of their UUID @@ -417,14 +417,14 @@ Configure controller-0 Optionally Configure PCI-SRIOV Interfaces ***************************************** -#. **Optionally**, configure pci-sriov interfaces for controller-0. +#. **Optionally**, configure pci-sriov interfaces for controller-0. This step is **optional** for Kubernetes. Do this step if using |SRIOV| network attachments in hosted application containers. .. only:: openstack - This step is **optional** for OpenStack. Do this step if using |SRIOV| + This step is **optional** for OpenStack. Do this step if using |SRIOV| vNICs in hosted application VMs. Note that pci-sriov interfaces can have the same Data Networks assigned to them as vswitch data interfaces. @@ -706,25 +706,25 @@ Configure controller-1 system host-pv-add ${NODE} nova-local ${NOVA_PARTITION_UUID} sleep 2 - #. **For OpenStack only:** Configure data interfaces for controller-1. + #. **For OpenStack only:** Configure data interfaces for controller-1. Data class interfaces are vswitch interfaces used by vswitch to provide - VM virtio vNIC connectivity to OpenStack Neutron Tenant Networks on the + VM virtio vNIC connectivity to OpenStack Neutron Tenant Networks on the underlying assigned Data Network. - + .. important:: - + A compute-labeled All-in-one controller host **MUST** have at least one Data class interface. - + * Configure the data interfaces for controller-1. - + :: - + export NODE=controller-1 - + # List inventoried host’s ports and identify ports to be used as ‘data’ interfaces, # based on displayed linux port name, pci address and device type. system host-port-list ${NODE} - + # List host’s auto-configured ‘ethernet’ interfaces, # find the interfaces corresponding to the ports identified in previous step, and # take note of their UUID @@ -749,14 +749,14 @@ Configure controller-1 Optionally Configure PCI-SRIOV Interfaces ***************************************** -#. **Optionally**, configure pci-sriov interfaces for controller-1. +#. **Optionally**, configure pci-sriov interfaces for controller-1. This step is **optional** for Kubernetes. Do this step if using |SRIOV| network attachments in hosted application containers. .. only:: openstack - This step is **optional** for OpenStack. Do this step if using |SRIOV| + This step is **optional** for OpenStack. Do this step if using |SRIOV| vNICs in hosted application VMs. Note that pci-sriov interfaces can have the same Data Networks assigned to them as vswitch data interfaces. 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 2249e4a71..63bc10f51 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 @@ -348,25 +348,25 @@ The newly installed controller needs to be configured. system host-pv-add ${NODE} nova-local ${NOVA_PARTITION_UUID} sleep 2 - #. **For OpenStack only:** Configure data interfaces for controller-0. + #. **For OpenStack only:** Configure data interfaces for controller-0. Data class interfaces are vswitch interfaces used by vswitch to provide - VM virtio vNIC connectivity to OpenStack Neutron Tenant Networks on the + VM virtio vNIC connectivity to OpenStack Neutron Tenant Networks on the underlying assigned Data Network. - + .. important:: - + A compute-labeled worker host **MUST** have at least one Data class interface. - + * Configure the data interfaces for controller-0. - + :: - + export NODE=controller-0 - + # List inventoried host’s ports and identify ports to be used as ‘data’ interfaces, # based on displayed linux port name, pci address and device type. system host-port-list ${NODE} - + # List host’s auto-configured ‘ethernet’ interfaces, # find the interfaces corresponding to the ports identified in previous step, and # take note of their UUID @@ -392,14 +392,14 @@ The newly installed controller needs to be configured. Optionally Configure PCI-SRIOV Interfaces ***************************************** -#. **Optionally**, configure pci-sriov interfaces for controller-0. +#. **Optionally**, configure pci-sriov interfaces for controller-0. This step is **optional** for Kubernetes. Do this step if using |SRIOV| network attachments in hosted application containers. .. only:: openstack - This step is **optional** for OpenStack. Do this step if using |SRIOV| + This step is **optional** for OpenStack. Do this step if using |SRIOV| vNICs in hosted application VMs. Note that pci-sriov interfaces can have the same Data Networks assigned to them as vswitch data interfaces. diff --git a/doc/source/deploy_install_guides/r5_release/bare_metal/controller_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/bare_metal/controller_storage_install_kubernetes.rst index 615374955..17b0125d1 100644 --- a/doc/source/deploy_install_guides/r5_release/bare_metal/controller_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/bare_metal/controller_storage_install_kubernetes.rst @@ -621,17 +621,17 @@ Configure worker nodes #. **For OpenStack only:** Configure data interfaces for worker nodes. Data class interfaces are vswitch interfaces used by vswitch to provide - VM virtio vNIC connectivity to OpenStack Neutron Tenant Networks on the + VM virtio vNIC connectivity to OpenStack Neutron Tenant Networks on the underlying assigned Data Network. - + .. important:: - + A compute-labeled worker host **MUST** have at least one Data class interface. - + * Configure the data interfaces for worker nodes. - + :: - + # Execute the following lines with export NODE=worker-0 # and then repeat with @@ -672,7 +672,7 @@ Optionally Configure PCI-SRIOV Interfaces .. only:: openstack - This step is **optional** for OpenStack. Do this step if using |SRIOV| + This step is **optional** for OpenStack. Do this step if using |SRIOV| vNICs in hosted application VMs. Note that pci-sriov interfaces can have the same Data Networks assigned to them as vswitch data interfaces.