Add Install Notice to R5 guides
Add “Install Notice” changes for R5 install guides in
main branch. (Repeat of review 792961)
Add license.rest file.
Delete R6 files (not in R5 branch).
Change-Id: I79844c5c0b09d8c2d93036a7ba2caa9cb6942f6e
Signed-off-by: MCamp859 <maryx.camp@intel.com>
(cherry picked from commit c7b3bb8068)
Signed-off-by: MCamp859 <maryx.camp@intel.com>
This commit is contained in:
0
doc/source/_includes/72hr-to-license.rest
Normal file
0
doc/source/_includes/72hr-to-license.rest
Normal file
@@ -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 <use-private-docker-registry>`
|
||||
for more information.
|
||||
See :ref:`Use a Private Docker Registry <use-private-docker-registry-r5>`
|
||||
for more information.
|
||||
|
||||
.. only:: starlingx
|
||||
|
||||
@@ -957,4 +957,6 @@ machine.
|
||||
|
||||
.. include:: ../kubernetes_install_next.txt
|
||||
|
||||
.. include:: /_includes/bootstrapping-and-deploying-starlingx.rest
|
||||
.. only:: partner
|
||||
|
||||
.. include:: /_includes/72hr-to-license.rest
|
||||
|
||||
@@ -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 <use-private-docker-registry>`
|
||||
See :ref:`Use a Private Docker Registry <use-private-docker-registry-r5>`
|
||||
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
|
||||
|
||||
@@ -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 <use-private-docker-registry>`
|
||||
See :ref:`Use a Private Docker Registry <use-private-docker-registry-r5>`
|
||||
for more information.
|
||||
|
||||
.. only:: starlingx
|
||||
@@ -809,3 +809,8 @@ If configuring Ceph Storage Backend, Add Ceph OSDs to controllers
|
||||
----------
|
||||
|
||||
.. include:: ../kubernetes_install_next.txt
|
||||
|
||||
|
||||
.. only:: partner
|
||||
|
||||
.. include:: /_includes/72hr-to-license.rest
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
.. _dedicated_storage_install_kubernetes:
|
||||
.. _dedicated_storage_install_kubernetes_r5:
|
||||
|
||||
.. only:: partner
|
||||
|
||||
@@ -601,3 +601,8 @@ host machine.
|
||||
----------
|
||||
|
||||
.. include:: ../kubernetes_install_next.txt
|
||||
|
||||
|
||||
.. only:: partner
|
||||
|
||||
.. include:: /_includes/72hr-to-license.rest
|
||||
|
||||
@@ -44,7 +44,7 @@ Appendixes
|
||||
**********
|
||||
|
||||
|
||||
.. _use-private-docker-registry:
|
||||
.. _use-private-docker-registry-r5:
|
||||
|
||||
Use a private Docker registry
|
||||
*****************************
|
||||
|
||||
Reference in New Issue
Block a user