From c7b3bb8068f27b1ebb227dbfc3bfeff74fcc29d5 Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Thu, 1 Jul 2021 21:00:47 -0400 Subject: [PATCH] Add Install Notice to R5 guides MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add “Install Notice” changes for R5 install guides in main branch. (Repeat of review 792961) Add missing StarlingX only condition in two R6 guides. Change-Id: I79844c5c0b09d8c2d93036a7ba2caa9cb6942f6e Signed-off-by: MCamp859 --- .../bare_metal/aio_duplex_install_kubernetes.rst | 11 ++++++++--- .../bare_metal/aio_simplex_install_kubernetes.rst | 11 +++++++++-- .../controller_storage_install_kubernetes.rst | 9 +++++++-- .../dedicated_storage_install_kubernetes.rst | 7 ++++++- doc/source/deploy_install_guides/r5_release/index.rst | 2 +- .../bare_metal/aio_simplex_install_kubernetes.rst | 2 ++ .../dedicated_storage_install_kubernetes.rst | 10 ++++++---- 7 files changed, 39 insertions(+), 13 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 2e9e66a2c..5047130ef 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 @@ -1,5 +1,5 @@ -.. _aio_duplex_install_kubernetes: +.. _aio_duplex_install_kubernetes_r5: ================================================ Install Kubernetes Platform on All-in-one Duplex @@ -170,8 +170,8 @@ Bootstrap system on controller-0 # certificate as a Trusted CA ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem - See :ref:`Use a Private Docker Registry ` - for more information. + See :ref:`Use a Private Docker Registry ` + for more information. .. only:: starlingx @@ -956,3 +956,8 @@ machine. ---------- .. include:: ../kubernetes_install_next.txt + + +.. only:: partner + + .. include:: /_includes/72hr-to-license.rest 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 0e60ff217..7b67aa635 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 @@ -1,5 +1,5 @@ -.. _aio_simplex_install_kubernetes: +.. _aio_simplex_install_kubernetes_r5: ================================================= Install Kubernetes Platform on All-in-one Simplex @@ -168,7 +168,7 @@ Bootstrap system on controller-0 # certificate as a Trusted CA ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem - See :ref:`Use a Private Docker Registry ` + See :ref:`Use a Private Docker Registry ` for more information. @@ -600,8 +600,15 @@ machine. rook--ceph-tools-5778d7f6c-22tms 1/1 Running 0 64m rook--discover-kmv6c 1/1 Running 0 65m +.. only:: starlingx + ---------- Next steps ---------- .. include:: ../kubernetes_install_next.txt + + +.. only:: partner + + .. include:: /_includes/72hr-to-license.rest 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 b1136e348..828c45f23 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 @@ -1,5 +1,5 @@ -.. _controller_storage_install_kubernetes: +.. _controller_storage_install_kubernetes_r5: =============================================================== Install Kubernetes Platform on Standard with Controller Storage @@ -169,7 +169,7 @@ Bootstrap system on controller-0 # certificate as a Trusted CA ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem - See :ref:`Use a Private Docker Registry ` + See :ref:`Use a Private Docker Registry ` for more information. .. only:: starlingx @@ -810,3 +810,8 @@ If configuring Ceph Storage Backend, Add Ceph OSDs to controllers ---------- .. include:: ../kubernetes_install_next.txt + + +.. only:: partner + + .. include:: /_includes/72hr-to-license.rest diff --git a/doc/source/deploy_install_guides/r5_release/bare_metal/dedicated_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/bare_metal/dedicated_storage_install_kubernetes.rst index a959b79b8..81d7f4080 100644 --- a/doc/source/deploy_install_guides/r5_release/bare_metal/dedicated_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/bare_metal/dedicated_storage_install_kubernetes.rst @@ -1,6 +1,6 @@ -.. _dedicated_storage_install_kubernetes: +.. _dedicated_storage_install_kubernetes_r5: .. only:: partner @@ -505,3 +505,8 @@ host machine. ---------- .. include:: ../kubernetes_install_next.txt + + +.. only:: partner + + .. include:: /_includes/72hr-to-license.rest diff --git a/doc/source/deploy_install_guides/r5_release/index.rst b/doc/source/deploy_install_guides/r5_release/index.rst index f83d17589..261773417 100644 --- a/doc/source/deploy_install_guides/r5_release/index.rst +++ b/doc/source/deploy_install_guides/r5_release/index.rst @@ -44,7 +44,7 @@ Appendixes ********** -.. _use-private-docker-registry: +.. _use-private-docker-registry-r5: Use a private Docker registry ***************************** 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 8d55d2c46..18e8d0042 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 @@ -600,6 +600,8 @@ machine. rook--ceph-tools-5778d7f6c-22tms 1/1 Running 0 64m rook--discover-kmv6c 1/1 Running 0 65m +.. only:: starlingx + ---------- Next steps ---------- diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst index fa4e97758..6f1d596fb 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst @@ -498,11 +498,13 @@ The worker nodes 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. ----------- -Next steps ----------- +.. only:: starlingx -.. include:: ../kubernetes_install_next.txt + ---------- + Next steps + ---------- + + .. include:: ../kubernetes_install_next.txt .. only:: partner