From b486a0105f17964893acdaead47a9446c9e73d3a Mon Sep 17 00:00:00 2001 From: Ron Stone Date: Thu, 2 Mar 2023 17:47:55 +0000 Subject: [PATCH] Fix Install link Fix circular r8 install link. Signed-off-by: Ron Stone Change-Id: I44ac3dbda9b7979f667123b42bbb1ded0f817975 --- doc/source/_this.txt | 2 +- .../index-install-e083ca818006.rst | 10 +++++++--- .../release/kubernetes_access.rst | 6 +++--- .../release/virtual/aio_duplex.rst | 6 +++--- .../release/virtual/aio_duplex_environ.rst | 2 +- .../release/virtual/aio_duplex_install_kubernetes.rst | 10 ++++++---- .../release/virtual/aio_simplex_environ.rst | 2 +- .../release/virtual/aio_simplex_install_kubernetes.rst | 7 ++++--- .../release/virtual/controller_storage.rst | 6 +++--- .../release/virtual/controller_storage_environ.rst | 2 +- .../virtual/controller_storage_install_kubernetes.rst | 6 +++--- .../release/virtual/dedicated_storage.rst | 6 +++--- .../release/virtual/dedicated_storage_environ.rst | 2 +- .../virtual/dedicated_storage_install_kubernetes.rst | 6 +++--- .../release/virtual/rook_storage.rst | 6 +++--- .../release/virtual/rook_storage_environ.rst | 2 +- .../virtual/rook_storage_install_kubernetes.rst | 8 ++++---- 17 files changed, 48 insertions(+), 41 deletions(-) diff --git a/doc/source/_this.txt b/doc/source/_this.txt index 27cf94f4f..1318b122d 100644 --- a/doc/source/_this.txt +++ b/doc/source/_this.txt @@ -1,3 +1,3 @@ .. |this-prod| replace:: |prod-long| -.. |this-ver| replace:: r7.0 +.. |this-ver| replace:: r9.0 diff --git a/doc/source/deploy_install_guides/index-install-e083ca818006.rst b/doc/source/deploy_install_guides/index-install-e083ca818006.rst index 0be274a2b..8728fa607 100644 --- a/doc/source/deploy_install_guides/index-install-e083ca818006.rst +++ b/doc/source/deploy_install_guides/index-install-e083ca818006.rst @@ -13,8 +13,10 @@ Each guide provides instruction on a specific StarlingX configuration Upcoming release ---------------- -The next release will be R8.0. Use the installation procedures in -:ref:`index-install-e083ca818006`. +.. look up on this branch + +The next release will be R9.0. Use the installation procedures in +:ref:`index-install-r7-8966076f0e81`. --------------- Current release @@ -22,8 +24,10 @@ Current release R8.0 is the current release of StarlingX. +.. reference explicitely on release branch + Use the `R8.0 Installation Guides -`__ +`__ to install R8.0. diff --git a/doc/source/deploy_install_guides/release/kubernetes_access.rst b/doc/source/deploy_install_guides/release/kubernetes_access.rst index 5ee6c6f47..abf84fded 100644 --- a/doc/source/deploy_install_guides/release/kubernetes_access.rst +++ b/doc/source/deploy_install_guides/release/kubernetes_access.rst @@ -1,8 +1,8 @@ .. _kubernetes_access_r7: -================================ -Access StarlingX Kubernetes R7.0 -================================ +=========================== +Access StarlingX Kubernetes +=========================== This section describes how to use local/remote CLIs, GUIs, and/or REST APIs to access and manage StarlingX Kubernetes and hosted containerized applications. diff --git a/doc/source/deploy_install_guides/release/virtual/aio_duplex.rst b/doc/source/deploy_install_guides/release/virtual/aio_duplex.rst index 313a05523..23f524508 100644 --- a/doc/source/deploy_install_guides/release/virtual/aio_duplex.rst +++ b/doc/source/deploy_install_guides/release/virtual/aio_duplex.rst @@ -1,6 +1,6 @@ -=========================================== -Virtual All-in-one Duplex Installation R7.0 -=========================================== +====================================== +Virtual All-in-one Duplex Installation +====================================== -------- Overview diff --git a/doc/source/deploy_install_guides/release/virtual/aio_duplex_environ.rst b/doc/source/deploy_install_guides/release/virtual/aio_duplex_environ.rst index b595ffc36..3eecdd101 100644 --- a/doc/source/deploy_install_guides/release/virtual/aio_duplex_environ.rst +++ b/doc/source/deploy_install_guides/release/virtual/aio_duplex_environ.rst @@ -3,7 +3,7 @@ Prepare Host and Environment ============================ This section describes how to prepare the physical host and virtual environment -for a **StarlingX R7.0 virtual All-in-one Duplex** deployment configuration. +for a StarlingX |this-ver| virtual All-in-one Duplex deployment configuration. .. contents:: :local: diff --git a/doc/source/deploy_install_guides/release/virtual/aio_duplex_install_kubernetes.rst b/doc/source/deploy_install_guides/release/virtual/aio_duplex_install_kubernetes.rst index ee5b86be6..1bd611088 100644 --- a/doc/source/deploy_install_guides/release/virtual/aio_duplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/release/virtual/aio_duplex_install_kubernetes.rst @@ -3,7 +3,7 @@ Install StarlingX Kubernetes on Virtual AIO-DX ============================================== This section describes the steps to install the StarlingX Kubernetes platform -on a **StarlingX R7.0 virtual All-in-one Duplex** deployment configuration. +on a StarlingX |this-ver| virtual All-in-one Duplex deployment configuration. .. contents:: :local: @@ -13,10 +13,12 @@ on a **StarlingX R7.0 virtual All-in-one Duplex** deployment configuration. Install software on controller-0 -------------------------------- -In the last step of :doc:`aio_duplex_environ`, the controller-0 virtual server 'duplex-controller-0' was started by the :command:`setup_configuration.sh` command. +In the last step of :doc:`aio_duplex_environ`, the controller-0 virtual server +'duplex-controller-0' was started by the :command:`setup_configuration.sh` +command. -On the host, attach to the console of virtual controller-0 and select the appropriate -installer menu options to start the non-interactive install of +On the host, attach to the console of virtual controller-0 and select the +appropriate installer menu options to start the non-interactive install of StarlingX software on controller-0. .. note:: diff --git a/doc/source/deploy_install_guides/release/virtual/aio_simplex_environ.rst b/doc/source/deploy_install_guides/release/virtual/aio_simplex_environ.rst index 126179180..4e7a87c1d 100644 --- a/doc/source/deploy_install_guides/release/virtual/aio_simplex_environ.rst +++ b/doc/source/deploy_install_guides/release/virtual/aio_simplex_environ.rst @@ -3,7 +3,7 @@ Prepare Host and Environment ============================ This section describes how to prepare the physical host and virtual environment -for a **StarlingX R7.0 virtual All-in-one Simplex** deployment configuration. +for a StarlingX |this-ver| virtual All-in-one Simplex deployment configuration. .. contents:: :local: diff --git a/doc/source/deploy_install_guides/release/virtual/aio_simplex_install_kubernetes.rst b/doc/source/deploy_install_guides/release/virtual/aio_simplex_install_kubernetes.rst index 6f949c303..dd3c3afb7 100644 --- a/doc/source/deploy_install_guides/release/virtual/aio_simplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/release/virtual/aio_simplex_install_kubernetes.rst @@ -3,7 +3,7 @@ Install StarlingX Kubernetes on Virtual AIO-SX ============================================== This section describes the steps to install the StarlingX Kubernetes platform -on a **StarlingX R7.0 virtual All-in-one Simplex** deployment configuration. +on a StarlingX |this-ver| virtual All-in-one Simplex deployment configuration. .. contents:: :local: @@ -13,8 +13,9 @@ on a **StarlingX R7.0 virtual All-in-one Simplex** deployment configuration. Install software on controller-0 -------------------------------- -In the last step of :doc:`aio_simplex_environ`, the controller-0 virtual server 'simplex-controller-0' -was started by the :command:`setup_configuration.sh` command. +In the last step of :doc:`aio_simplex_environ`, the controller-0 virtual server +'simplex-controller-0' was started by the :command:`setup_configuration.sh` +command. On the host, attach to the console of virtual controller-0 and select the appropriate installer menu options to start the non-interactive install of diff --git a/doc/source/deploy_install_guides/release/virtual/controller_storage.rst b/doc/source/deploy_install_guides/release/virtual/controller_storage.rst index 1ec643d87..00c9d453f 100644 --- a/doc/source/deploy_install_guides/release/virtual/controller_storage.rst +++ b/doc/source/deploy_install_guides/release/virtual/controller_storage.rst @@ -1,6 +1,6 @@ -========================================================== -Virtual Standard with Controller Storage Installation R7.0 -========================================================== +===================================================== +Virtual Standard with Controller Storage Installation +===================================================== -------- Overview diff --git a/doc/source/deploy_install_guides/release/virtual/controller_storage_environ.rst b/doc/source/deploy_install_guides/release/virtual/controller_storage_environ.rst index eb5b201d4..eed8e4632 100644 --- a/doc/source/deploy_install_guides/release/virtual/controller_storage_environ.rst +++ b/doc/source/deploy_install_guides/release/virtual/controller_storage_environ.rst @@ -3,7 +3,7 @@ Prepare Host and Environment ============================ This section describes how to prepare the physical host and virtual environment -for a **StarlingX R7.0 virtual Standard with Controller Storage** deployment +for a StarlingX |this-ver| virtual Standard with Controller Storage deployment configuration. .. contents:: diff --git a/doc/source/deploy_install_guides/release/virtual/controller_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/release/virtual/controller_storage_install_kubernetes.rst index a73d3d2eb..cacc9e63a 100644 --- a/doc/source/deploy_install_guides/release/virtual/controller_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/release/virtual/controller_storage_install_kubernetes.rst @@ -3,7 +3,7 @@ Install StarlingX Kubernetes on Virtual Standard with Controller Storage ======================================================================== This section describes the steps to install the StarlingX Kubernetes platform -on a **StarlingX R7.0 virtual Standard with Controller Storage** deployment +on a StarlingX |this-ver| virtual Standard with Controller Storage deployment configuration. .. contents:: @@ -18,8 +18,8 @@ In the last step of :doc:`controller_storage_environ`, the controller-0 virtual server 'controllerstorage-controller-0' was started by the :command:`setup_configuration.sh` command. -On the host, attach to the console of virtual controller-0 and select the appropriate -installer menu options to start the non-interactive install of +On the host, attach to the console of virtual controller-0 and select the +appropriate installer menu options to start the non-interactive install of StarlingX software on controller-0. .. note:: diff --git a/doc/source/deploy_install_guides/release/virtual/dedicated_storage.rst b/doc/source/deploy_install_guides/release/virtual/dedicated_storage.rst index 295ef00a4..a2548b85a 100644 --- a/doc/source/deploy_install_guides/release/virtual/dedicated_storage.rst +++ b/doc/source/deploy_install_guides/release/virtual/dedicated_storage.rst @@ -1,6 +1,6 @@ -========================================================= -Virtual Standard with Dedicated Storage Installation R7.0 -========================================================= +==================================================== +Virtual Standard with Dedicated Storage Installation +==================================================== -------- Overview diff --git a/doc/source/deploy_install_guides/release/virtual/dedicated_storage_environ.rst b/doc/source/deploy_install_guides/release/virtual/dedicated_storage_environ.rst index ebf382e21..f4a606420 100644 --- a/doc/source/deploy_install_guides/release/virtual/dedicated_storage_environ.rst +++ b/doc/source/deploy_install_guides/release/virtual/dedicated_storage_environ.rst @@ -3,7 +3,7 @@ Prepare Host and Environment ============================ This section describes how to prepare the physical host and virtual environment -for a **StarlingX R7.0 virtual Standard with Dedicated Storage** deployment +for a StarlingX |this-ver| virtual Standard with Dedicated Storage deployment configuration. .. contents:: diff --git a/doc/source/deploy_install_guides/release/virtual/dedicated_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/release/virtual/dedicated_storage_install_kubernetes.rst index f44ed4f05..e4807765a 100644 --- a/doc/source/deploy_install_guides/release/virtual/dedicated_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/release/virtual/dedicated_storage_install_kubernetes.rst @@ -3,7 +3,7 @@ Install StarlingX Kubernetes on Virtual Standard with Dedicated Storage ======================================================================= This section describes the steps to install the StarlingX Kubernetes platform -on a **StarlingX R7.0 virtual Standard with Dedicated Storage** deployment +on a StarlingX |this-ver| virtual Standard with Dedicated Storage deployment configuration. .. contents:: @@ -18,8 +18,8 @@ In the last step of :doc:`dedicated_storage_environ`, the controller-0 virtual server 'dedicatedstorage-controller-0' was started by the :command:`setup_configuration.sh` command. -On the host, attach to the console of virtual controller-0 and select the appropriate -installer menu options to start the non-interactive install of +On the host, attach to the console of virtual controller-0 and select the +appropriate installer menu options to start the non-interactive install of StarlingX software on controller-0. .. note:: diff --git a/doc/source/deploy_install_guides/release/virtual/rook_storage.rst b/doc/source/deploy_install_guides/release/virtual/rook_storage.rst index a3dcd2b03..7bb140bf1 100644 --- a/doc/source/deploy_install_guides/release/virtual/rook_storage.rst +++ b/doc/source/deploy_install_guides/release/virtual/rook_storage.rst @@ -1,6 +1,6 @@ -==================================================== -Virtual Standard with Rook Storage Installation R7.0 -==================================================== +=============================================== +Virtual Standard with Rook Storage Installation +=============================================== -------- Overview diff --git a/doc/source/deploy_install_guides/release/virtual/rook_storage_environ.rst b/doc/source/deploy_install_guides/release/virtual/rook_storage_environ.rst index 4b9fbe1a8..e8a7aca40 100644 --- a/doc/source/deploy_install_guides/release/virtual/rook_storage_environ.rst +++ b/doc/source/deploy_install_guides/release/virtual/rook_storage_environ.rst @@ -3,7 +3,7 @@ Prepare Host and Environment ============================ This section describes how to prepare the physical host and virtual environment -for a **StarlingX R7.0 virtual Standard with Rook Storage** deployment +for a StarlingX |this-ver| virtual Standard with Rook Storage deployment configuration. .. contents:: diff --git a/doc/source/deploy_install_guides/release/virtual/rook_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/release/virtual/rook_storage_install_kubernetes.rst index 1738d1e12..e3dad6d3a 100644 --- a/doc/source/deploy_install_guides/release/virtual/rook_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/release/virtual/rook_storage_install_kubernetes.rst @@ -3,8 +3,8 @@ Install StarlingX Kubernetes on Virtual Standard with Rook Storage ================================================================== This section describes the steps to install the StarlingX Kubernetes platform -on a **StarlingX R7.0 virtual Standard with Rook Storage** deployment configuration, -deploy rook ceph cluster replacing default native ceph cluster. +on a StarlingX |this-ver| virtual Standard with Rook Storage deployment +configuration, deploy rook ceph cluster replacing default native ceph cluster. .. contents:: :local: @@ -18,8 +18,8 @@ In the last step of :doc:`rook_storage_environ`, the controller-0 virtual server 'rookstorage-controller-0' was started by the :command:`setup_configuration.sh` command. -On the host, attach to the console of virtual controller-0 and select the appropriate -installer menu options to start the non-interactive install of +On the host, attach to the console of virtual controller-0 and select the +appropriate installer menu options to start the non-interactive install of StarlingX software on controller-0. .. note::