starlingx/docs
Code Issues Proposed changes

Merge "Add Install Notice to R5 guides"

Browse Source
This commit is contained in:
Zuul 2021-07-05 18:17:49 +00:00 committed by Gerrit Code Review
commit 0178cf2078
7 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst
View File

@ -1,5 +1,5 @@
.. _aio_duplex_install_kubernetes: .. _aio_duplex_install_kubernetes_r5:
================================================ ================================================
Install Kubernetes Platform on All-in-one Duplex Install Kubernetes Platform on All-in-one Duplex
@ -170,7 +170,7 @@ Bootstrap system on controller-0
# certificate as a Trusted CA # certificate as a Trusted CA
ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem
See :ref:`Use a Private Docker Registry <use-private-docker-registry>` See :ref:`Use a Private Docker Registry <use-private-docker-registry-r5>`
for more information. for more information.
.. only:: starlingx .. only:: starlingx
@ -956,3 +956,8 @@ machine.
---------- ----------
.. include:: ../kubernetes_install_next.txt .. include:: ../kubernetes_install_next.txt
.. only:: partner
.. include:: /_includes/72hr-to-license.rest

11
doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst
View File

@ -1,5 +1,5 @@
.. _aio_simplex_install_kubernetes: .. _aio_simplex_install_kubernetes_r5:
================================================= =================================================
Install Kubernetes Platform on All-in-one Simplex Install Kubernetes Platform on All-in-one Simplex
@ -168,7 +168,7 @@ Bootstrap system on controller-0
# certificate as a Trusted CA # certificate as a Trusted CA
ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem
See :ref:`Use a Private Docker Registry <use-private-docker-registry>` See :ref:`Use a Private Docker Registry <use-private-docker-registry-r5>`
for more information. for more information.
@ -600,8 +600,15 @@ machine.
rook--ceph-tools-5778d7f6c-22tms 1/1 Running 0 64m rook--ceph-tools-5778d7f6c-22tms 1/1 Running 0 64m
rook--discover-kmv6c 1/1 Running 0 65m rook--discover-kmv6c 1/1 Running 0 65m
.. only:: starlingx
---------- ----------
Next steps Next steps
---------- ----------
.. include:: ../kubernetes_install_next.txt .. include:: ../kubernetes_install_next.txt
.. only:: partner
.. include:: /_includes/72hr-to-license.rest

9
doc/source/deploy_install_guides/r5_release/bare_metal/controller_storage_install_kubernetes.rst
View File

@ -1,5 +1,5 @@
.. _controller_storage_install_kubernetes: .. _controller_storage_install_kubernetes_r5:
=============================================================== ===============================================================
Install Kubernetes Platform on Standard with Controller Storage Install Kubernetes Platform on Standard with Controller Storage
@ -169,7 +169,7 @@ Bootstrap system on controller-0
# certificate as a Trusted CA # certificate as a Trusted CA
ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem ssl_ca_cert: /home/sysadmin/myprivateregistry.abc.com-ca-cert.pem
See :ref:`Use a Private Docker Registry <use-private-docker-registry>` See :ref:`Use a Private Docker Registry <use-private-docker-registry-r5>`
for more information. for more information.
.. only:: starlingx .. only:: starlingx
@ -810,3 +810,8 @@ If configuring Ceph Storage Backend, Add Ceph OSDs to controllers
---------- ----------
.. include:: ../kubernetes_install_next.txt .. include:: ../kubernetes_install_next.txt
.. only:: partner
.. include:: /_includes/72hr-to-license.rest

7
doc/source/deploy_install_guides/r5_release/bare_metal/dedicated_storage_install_kubernetes.rst
View File

@ -1,6 +1,6 @@
.. _dedicated_storage_install_kubernetes: .. _dedicated_storage_install_kubernetes_r5:
.. only:: partner .. only:: partner
@ -505,3 +505,8 @@ host machine.
---------- ----------
.. include:: ../kubernetes_install_next.txt .. include:: ../kubernetes_install_next.txt
.. only:: partner
.. include:: /_includes/72hr-to-license.rest

2
doc/source/deploy_install_guides/r5_release/index.rst
View File

@ -44,7 +44,7 @@ Appendixes
********** **********
.. _use-private-docker-registry: .. _use-private-docker-registry-r5:
Use a private Docker registry Use a private Docker registry
***************************** *****************************

2
doc/source/deploy_install_guides/r6_release/bare_metal/aio_simplex_install_kubernetes.rst
View File

@ -600,6 +600,8 @@ machine.
rook--ceph-tools-5778d7f6c-22tms 1/1 Running 0 64m rook--ceph-tools-5778d7f6c-22tms 1/1 Running 0 64m
rook--discover-kmv6c 1/1 Running 0 65m rook--discover-kmv6c 1/1 Running 0 65m
.. only:: starlingx
---------- ----------
Next steps Next steps
---------- ----------

2
doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst
View File

@ -498,6 +498,8 @@ 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 into service. This can take 5-10 minutes, depending on the performance of the
host machine. host machine.
.. only:: starlingx
---------- ----------
Next steps Next steps
---------- ----------