From 6b4f05debc57b8727d75abbc979ca97020340352 Mon Sep 17 00:00:00 2001 From: Ron Stone Date: Sat, 31 Jul 2021 18:11:16 -0400 Subject: [PATCH] Handle DS AWS creds Moved code block to an include file for conditionalization purposes. Patchset 1 review updates. Patchset 2 review updates. Patchset 3 review updates. Patchset 4 review updates. Patchset 5 review updates. Signed-off-by: Ron Stone Change-Id: I1b5966a3b0a8a0ee03b1e95a1e7cebe19c66eda6 Signed-off-by: Ron Stone --- .../min-bootstrap-overrides-non-simplex.rest | 31 ++++ .../min-bootstrap-overrides-simplex.rest | 29 +++ .../aio_duplex_install_kubernetes.rst | 168 ++++++++--------- .../aio_simplex_install_kubernetes.rst | 94 ++++------ .../controller_storage_install_kubernetes.rst | 99 +++++++--- .../aio_duplex_install_kubernetes.rst | 170 ++++++++---------- .../aio_simplex_install_kubernetes.rst | 93 ++++------ .../controller_storage_install_kubernetes.rst | 98 +++++++--- 8 files changed, 447 insertions(+), 335 deletions(-) create mode 100644 doc/source/_includes/min-bootstrap-overrides-non-simplex.rest create mode 100644 doc/source/_includes/min-bootstrap-overrides-simplex.rest diff --git a/doc/source/_includes/min-bootstrap-overrides-non-simplex.rest b/doc/source/_includes/min-bootstrap-overrides-non-simplex.rest new file mode 100644 index 000000000..6840414c4 --- /dev/null +++ b/doc/source/_includes/min-bootstrap-overrides-non-simplex.rest @@ -0,0 +1,31 @@ +:: + + cd ~ + + cat < localhost.yml + + system_mode: duplex + + dns_servers: + - 8.8.8.8 + - 8.8.4.4 + + external_oam_subnet: / + external_oam_gateway_address: + external_oam_floating_address: + external_oam_node_0_address: + external_oam_node_1_address: + + admin_username: admin + admin_password: + ansible_become_pass: + + # OPTIONALLY provide a ROOT CA certificate and key for k8s root ca, + # if not specified, one will be auto-generated, + # see ‘Kubernetes Root CA Certificate’ in Security Guide for details. + k8s_root_ca_cert: < your_root_ca_cert.pem > + k8s_root_ca_key: < your_root_ca_key.pem > + apiserver_cert_sans: + - < your_hostname_for_oam_floating.your_domain > + + EOF \ No newline at end of file diff --git a/doc/source/_includes/min-bootstrap-overrides-simplex.rest b/doc/source/_includes/min-bootstrap-overrides-simplex.rest new file mode 100644 index 000000000..3e24188d4 --- /dev/null +++ b/doc/source/_includes/min-bootstrap-overrides-simplex.rest @@ -0,0 +1,29 @@ +:: + + cd ~ + + cat < localhost.yml + + system_mode: simplex + + dns_servers: + - 8.8.8.8 + - 8.8.4.4 + + external_oam_subnet: / + external_oam_gateway_address: + external_oam_floating_address: + + admin_username: admin + admin_password: + ansible_become_pass: + + # OPTIONALLY provide a ROOT CA certificate and key for k8s root ca, + # if not specified, one will be auto-generated, + # see ‘Kubernetes Root CA Certificate’ in Security Guide for details. + k8s_root_ca_cert: < your_root_ca_cert.pem > + k8s_root_ca_key: < your_root_ca_key.pem > + apiserver_cert_sans: + - < your_hostname_for_oam_floating.your_domain > + + EOF \ No newline at end of file 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 8f3bf3f8f..c576f05b4 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 @@ -112,27 +112,7 @@ Bootstrap system on controller-0 configuration as shown in the example below. Use the OAM IP SUBNET and IP ADDRESSing applicable to your deployment environment. - :: - - cd ~ - cat < localhost.yml - system_mode: duplex - - dns_servers: - - 8.8.8.8 - - 8.8.4.4 - - external_oam_subnet: / - external_oam_gateway_address: - external_oam_floating_address: - external_oam_node_0_address: - external_oam_node_1_address: - - admin_username: admin - admin_password: - ansible_become_pass: - - EOF + .. include:: /_includes/min-bootstrap-overrides-non-simplex.rest .. only:: starlingx @@ -306,41 +286,6 @@ Configure controller-0 # assign 6 cores on processor/numa-node 0 on controller-0 to platform system host-cpu-modify -f platform -p0 6 controller-0 - #. Due to the additional openstack services’ containers running on the - controller host, the size of the docker filesystem needs to be - increased from the default size of 30G to 60G. - - .. code-block:: bash - - # check existing size of docker fs - 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-0 - # if existing docker fs size + cgts-vg available space is less than - # 80G, you will need to add a new disk partition to cgts-vg. - # There must be at least 20GB of available space after the docker - # filesystem is increased. - - # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. - # ( if not use another unused disk ) - - # Get device path of ROOT DISK - system host-show controller-0 --nowrap | fgrep rootfs - - # Get UUID of ROOT DISK by listing disks - 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 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-0 cgts-vg - sleep 2 # wait for partition to be added - - # Increase docker filesystem to 60G - system host-fs-modify controller-0 docker=60 #. **For OpenStack only:** Configure the system setting for the vSwitch. @@ -636,6 +581,44 @@ Unlock controller-0 :start-after: incl-unlock-controller-0-aio-simplex-start: :end-before: incl-unlock-controller-0-aio-simplex-end: +.. only:: openstack + + * **For OpenStack only:** Due to the additional openstack services’ + containers running on the controller host, the size of the docker + filesystem needs to be increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + 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-0 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-0 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + 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 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-0 cgts-vg + sleep 2 # wait for partition to be added + + # Increase docker filesystem to 60G + system host-fs-modify controller-0 docker=60 + ------------------------------------- Install software on controller-1 node ------------------------------------- @@ -752,41 +735,6 @@ Configure controller-1 # assign 6 cores on processor/numa-node 0 on controller-1 to platform system host-cpu-modify -f platform -p0 6 controller-1 - #. Due to the additional openstack services’ containers running on the - controller host, the size of the docker filesystem needs to be - increased from the default size of 30G to 60G. - - .. code-block:: bash - - # check existing size of docker fs - system host-fs-list controller-1 - # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located - system host-lvg-list controller-1 - # if existing docker fs size + cgts-vg available space is less than - # 80G, you will need to add a new disk partition to cgts-vg. - # There must be at least 20GB of available space after the docker - # filesystem is increased. - - # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. - # ( if not use another unused disk ) - - # Get device path of ROOT DISK - system host-show controller-1 --nowrap | fgrep rootfs - - # Get UUID of ROOT DISK by listing disks - system host-disk-list controller-1 - - # 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} - - # Add new partition to ‘cgts-vg’ local volume group - system host-pv-add controller-1 cgts-vg - sleep 2 # wait for partition to be added - - # Increase docker filesystem to 60G - system host-fs-modify controller-1 docker=60 #. **For OpenStack only:** Configure the host settings for the vSwitch. @@ -1027,6 +975,44 @@ Controller-1 will reboot in order to apply configuration changes and come into service. This can take 5-10 minutes, depending on the performance of the host machine. +.. only:: openstack + + * **For OpenStack only:** Due to the additional openstack services’ containers + running on the controller host, the size of the docker filesystem needs to be + increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + system host-fs-list controller-1 + # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located + system host-lvg-list controller-1 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-1 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + system host-disk-list controller-1 + + # 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} + + # Add new partition to ‘cgts-vg’ local volume group + system host-pv-add controller-1 cgts-vg + sleep 2 # wait for partition to be added + + # Increase docker filesystem to 60G + system host-fs-modify controller-1 docker=60 + .. only:: starlingx ----------------------------------------------------------------------------------------------- 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 f0be19fe8..d6a2cde51 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 @@ -112,25 +112,7 @@ Bootstrap system on controller-0 configuration as shown in the example below. Use the |OAM| IP SUBNET and IP ADDRESSing applicable to your deployment environment. - :: - - cd ~ - cat < localhost.yml - system_mode: simplex - - dns_servers: - - 8.8.8.8 - - 8.8.4.4 - - external_oam_subnet: / - external_oam_gateway_address: - external_oam_floating_address: - - admin_username: admin - admin_password: - ansible_become_pass: - - EOF + .. include:: /_includes/min-bootstrap-overrides-simplex.rest .. only:: starlingx @@ -286,42 +268,6 @@ The newly installed controller needs to be configured. # Assign 6 cores on processor/numa-node 0 on controller-0 to platform system host-cpu-modify -f platform -p0 6 controller-0 - #. Due to the additional openstack services’ containers running on the - controller host, the size of the docker filesystem needs to be - increased from the default size of 30G to 60G. - - .. code-block:: bash - - # check existing size of docker fs - 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-0 - # if existing docker fs size + cgts-vg available space is less than - # 80G, you will need to add a new disk partition to cgts-vg. - # There must be at least 20GB of available space after the docker - # filesystem is increased. - - # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. - # ( if not use another unused disk ) - - # Get device path of ROOT DISK - system host-show controller-0 --nowrap | fgrep rootfs - - # Get UUID of ROOT DISK by listing disks - 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-0 ${PARTITION_SIZE} - - # Add new partition to ‘cgts-vg’ local volume group - 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-0 docker=60 - #. **For OpenStack only:** Configure the system setting for the vSwitch. @@ -634,6 +580,44 @@ machine. .. incl-unlock-controller-0-aio-simplex-end: +.. only:: openstack + + * **For OpenStack only:** Due to the additional openstack services’ + containers running on the controller host, the size of the docker filesystem + needs to be increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + 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-0 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-0 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + 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-0 ${PARTITION_SIZE} + + # Add new partition to ‘cgts-vg’ local volume group + 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-0 docker=60 + .. only:: starlingx ----------------------------------------------------------------------------------------------- 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 367845e50..60dda96a2 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 @@ -111,27 +111,7 @@ Bootstrap system on controller-0 configuration 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 - system_mode: duplex - - dns_servers: - - 8.8.8.8 - - 8.8.4.4 - - external_oam_subnet: / - external_oam_gateway_address: - external_oam_floating_address: - external_oam_node_0_address: - external_oam_node_1_address: - - admin_username: admin - admin_password: - ansible_become_pass: - - EOF + .. include:: /_includes/min-bootstrap-overrides-non-simplex.rest .. only:: starlingx @@ -368,6 +348,44 @@ Controller-0 will reboot in order to apply configuration changes and come into service. This can take 5-10 minutes, depending on the performance of the host machine. +.. only:: openstack + + * **For OpenStack only:** Due to the additional openstack services’ + containers running on the controller host, the size of the docker + filesystem needs to be increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + 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-0 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-0 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + 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 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-0 cgts-vg + sleep 2 # wait for partition to be added + + # Increase docker filesystem to 60G + system host-fs-modify controller-0 docker=60 + ------------------------------------------------- Install software on controller-1 and worker nodes ------------------------------------------------- @@ -508,10 +526,49 @@ Unlock controller-1 in order to bring it into service: system host-unlock controller-1 + Controller-1 will reboot in order to apply configuration changes and come into service. This can take 5-10 minutes, depending on the performance of the host machine. +.. only:: openstack + + #. **For OpenStack only:** Due to the additional openstack services’ + containers running on the controller host, the size of the docker + filesystem needs to be increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + system host-fs-list controller-1 + # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located + system host-lvg-list controller-1 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-1 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + system host-disk-list controller-1 + + # 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} + + # Add new partition to ‘cgts-vg’ local volume group + system host-pv-add controller-1 cgts-vg + sleep 2 # wait for partition to be added + + # Increase docker filesystem to 60G + system host-fs-modify controller-1 docker=60 + .. incl-unlock-controller-1-end: .. include:: /_includes/bootstrapping-and-deploying-starlingx.rest 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 08efdbba3..6437ff36b 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 @@ -112,27 +112,7 @@ Bootstrap system on controller-0 configuration as shown in the example below. Use the OAM IP SUBNET and IP ADDRESSing applicable to your deployment environment. - :: - - cd ~ - cat < localhost.yml - system_mode: duplex - - dns_servers: - - 8.8.8.8 - - 8.8.4.4 - - external_oam_subnet: / - external_oam_gateway_address: - external_oam_floating_address: - external_oam_node_0_address: - external_oam_node_1_address: - - admin_username: admin - admin_password: - ansible_become_pass: - - EOF + .. include:: /_includes/min-bootstrap-overrides-non-simplex.rest .. only:: starlingx @@ -307,42 +287,6 @@ Configure controller-0 # assign 6 cores on processor/numa-node 0 on controller-0 to platform system host-cpu-modify -f platform -p0 6 controller-0 - #. Due to the additional openstack services’ containers running on the - controller host, the size of the docker filesystem needs to be - increased from the default size of 30G to 60G. - - .. code-block:: bash - - # check existing size of docker fs - 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-0 - # if existing docker fs size + cgts-vg available space is less than - # 80G, you will need to add a new disk partition to cgts-vg. - # There must be at least 20GB of available space after the docker - # filesystem is increased. - - # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. - # ( if not use another unused disk ) - - # Get device path of ROOT DISK - system host-show controller-0 --nowrap | fgrep rootfs - - # Get UUID of ROOT DISK by listing disks - 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 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-0 cgts-vg - sleep 2 # wait for partition to be added - - # Increase docker filesystem to 60G - system host-fs-modify controller-0 docker=60 - #. **For OpenStack only:** Configure the system setting for the vSwitch. @@ -643,6 +587,44 @@ Unlock controller-0 :start-after: incl-unlock-controller-0-aio-simplex-start: :end-before: incl-unlock-controller-0-aio-simplex-end: +.. only:: openstack + + * **For OpenStack Only** Due to the additional openstack services’ + containers running on the controller host, the size of the docker + filesystem needs to be increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + 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-0 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-0 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + 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 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-0 cgts-vg + sleep 2 # wait for partition to be added + + # Increase docker filesystem to 60G + system host-fs-modify controller-0 docker=60 + ------------------------------------- Install software on controller-1 node ------------------------------------- @@ -759,42 +741,6 @@ Configure controller-1 # assign 6 cores on processor/numa-node 0 on controller-1 to platform system host-cpu-modify -f platform -p0 6 controller-1 - #. Due to the additional openstack services’ containers running on the - controller host, the size of the docker filesystem needs to be - increased from the default size of 30G to 60G. - - .. code-block:: bash - - # check existing size of docker fs - system host-fs-list controller-1 - # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located - system host-lvg-list controller-1 - # if existing docker fs size + cgts-vg available space is less than - # 80G, you will need to add a new disk partition to cgts-vg. - # There must be at least 20GB of available space after the docker - # filesystem is increased. - - # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. - # ( if not use another unused disk ) - - # Get device path of ROOT DISK - system host-show controller-1 --nowrap | fgrep rootfs - - # Get UUID of ROOT DISK by listing disks - system host-disk-list controller-1 - - # 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} - - # Add new partition to ‘cgts-vg’ local volume group - system host-pv-add controller-1 cgts-vg - sleep 2 # wait for partition to be added - - # Increase docker filesystem to 60G - system host-fs-modify controller-1 docker=60 - #. **For OpenStack only:** Configure the host settings for the vSwitch. @@ -1034,6 +980,44 @@ Controller-1 will reboot in order to apply configuration changes and come into service. This can take 5-10 minutes, depending on the performance of the host machine. +.. only:: openstack + + * **For OpenStack only:** Due to the additional openstack services’ containers + running on the controller host, the size of the docker filesystem needs to + be increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + system host-fs-list controller-1 + # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located + system host-lvg-list controller-1 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-1 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + system host-disk-list controller-1 + + # 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} + + # Add new partition to ‘cgts-vg’ local volume group + system host-pv-add controller-1 cgts-vg + sleep 2 # wait for partition to be added + + # Increase docker filesystem to 60G + system host-fs-modify controller-1 docker=60 + .. only:: starlingx ----------------------------------------------------------------------------------------------- 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 141266197..bde6af605 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 @@ -112,25 +112,7 @@ Bootstrap system on controller-0 configuration as shown in the example below. Use the |OAM| IP SUBNET and IP ADDRESSing applicable to your deployment environment. - :: - - cd ~ - cat < localhost.yml - system_mode: simplex - - dns_servers: - - 8.8.8.8 - - 8.8.4.4 - - external_oam_subnet: / - external_oam_gateway_address: - external_oam_floating_address: - - admin_username: admin - admin_password: - ansible_become_pass: - - EOF + .. include:: /_includes/min-bootstrap-overrides-simplex.rest .. only:: starlingx @@ -285,41 +267,6 @@ The newly installed controller needs to be configured. # Assign 6 cores on processor/numa-node 0 on controller-0 to platform system host-cpu-modify -f platform -p0 6 controller-0 - #. Due to the additional openstack services’ containers running on the - controller host, the size of the docker filesystem needs to be - increased from the default size of 30G to 60G. - - .. code-block:: bash - - # check existing size of docker fs - 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-0 - # if existing docker fs size + cgts-vg available space is less than - # 80G, you will need to add a new disk partition to cgts-vg. - # There must be at least 20GB of available space after the docker - # filesystem is increased. - - # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. - # ( if not use another unused disk ) - - # Get device path of ROOT DISK - system host-show controller-0 --nowrap | fgrep rootfs - - # Get UUID of ROOT DISK by listing disks - 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-0 ${PARTITION_SIZE} - - # Add new partition to ‘cgts-vg’ local volume group - 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-0 docker=60 #. **For OpenStack only:** Configure the system setting for the vSwitch. @@ -629,6 +576,44 @@ machine. .. incl-unlock-controller-0-aio-simplex-end: +.. only:: openstack + + * **For OpenStack only:** Due to the additional openstack services’ + containers running on the controller host, the size of the docker + filesystem needs to be increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + 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-0 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-0 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + 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-0 ${PARTITION_SIZE} + + # Add new partition to ‘cgts-vg’ local volume group + 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-0 docker=60 + .. only:: starlingx ----------------------------------------------------------------------------------------------- diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_install_kubernetes.rst index 014d5b22f..21600ff0c 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_install_kubernetes.rst @@ -111,27 +111,7 @@ Bootstrap system on controller-0 configuration 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 - system_mode: duplex - - dns_servers: - - 8.8.8.8 - - 8.8.4.4 - - external_oam_subnet: / - external_oam_gateway_address: - external_oam_floating_address: - external_oam_node_0_address: - external_oam_node_1_address: - - admin_username: admin - admin_password: - ansible_become_pass: - - EOF + .. include:: /_includes/min-bootstrap-overrides-non-simplex.rest .. only:: starlingx @@ -368,6 +348,44 @@ Controller-0 will reboot in order to apply configuration changes and come into service. This can take 5-10 minutes, depending on the performance of the host machine. +.. only:: openstack + + * **For OpenStack only:** Due to the additional openstack services’ + containers running on the controller host, the size of the docker + filesystem needs to be increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + 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-0 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-0 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + 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 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-0 cgts-vg + sleep 2 # wait for partition to be added + + # Increase docker filesystem to 60G + system host-fs-modify controller-0 docker=60 + ------------------------------------------------- Install software on controller-1 and worker nodes ------------------------------------------------- @@ -511,6 +529,44 @@ Controller-1 will reboot in order to apply configuration changes and come into service. This can take 5-10 minutes, depending on the performance of the host machine. +.. only:: openstack + + * **For OpenStack only:** Due to the additional openstack services’ containers + running on the controller host, the size of the docker filesystem needs to be + increased from the default size of 30G to 60G. + + .. code-block:: bash + + # check existing size of docker fs + system host-fs-list controller-1 + # check available space (Avail Size (GiB)) in cgts-vg LVG where docker fs is located + system host-lvg-list controller-1 + # if existing docker fs size + cgts-vg available space is less than + # 80G, you will need to add a new disk partition to cgts-vg. + # There must be at least 20GB of available space after the docker + # filesystem is increased. + + # Assuming you have unused space on ROOT DISK, add partition to ROOT DISK. + # ( if not use another unused disk ) + + # Get device path of ROOT DISK + system host-show controller-1 --nowrap | fgrep rootfs + + # Get UUID of ROOT DISK by listing disks + system host-disk-list controller-1 + + # 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} + + # Add new partition to ‘cgts-vg’ local volume group + system host-pv-add controller-1 cgts-vg + sleep 2 # wait for partition to be added + + # Increase docker filesystem to 60G + system host-fs-modify controller-1 docker=60 + .. incl-unlock-controller-1-end: .. include:: /_includes/bootstrapping-and-deploying-starlingx.rest