Merge "Retire Virtual Install topics"

doc/source/deploy_install_guides/release/bare_metal/aio_duplex_install_kubernetes.rst

@@ -24,6 +24,8 @@ Overview
 
 .. include:: /shared/_includes/desc_aio_duplex.txt
 
+.. include:: /deploy_install_guides/release/bare_metal/automated-install-note--09dff208a9c6.rst 
+
 .. _installation-prereqs-dx:
 
 -----------------------------

doc/source/deploy_install_guides/release/bare_metal/aio_simplex_install_kubernetes.rst

@@ -21,6 +21,8 @@ Overview
 
 .. include:: /shared/_includes/desc_aio_simplex.txt
 
+.. include:: /deploy_install_guides/release/bare_metal/automated-install-note--09dff208a9c6.rst 
+
 .. _installation-prereqs:
 
 .. _aio_simplex_hardware_r7:

doc/source/deploy_install_guides/release/bare_metal/automated-install-note--09dff208a9c6.rst

@@ -0,0 +1,6 @@
+.. _bla-09dff208a9c6:
+
+.. only:: starlingx
+
+    For information on getting started quicky using an automated virtual
+    installation, see :ref:`automated_install`.

doc/source/deploy_install_guides/release/bare_metal/controller_storage_install_kubernetes.rst

@@ -24,6 +24,8 @@ Overview
 
 .. include:: /shared/_includes/desc_controller_storage.txt
 
+.. include:: /deploy_install_guides/release/bare_metal/automated-install-note--09dff208a9c6.rst 
+
 .. _installation-prereqs-std:
 
 -----------------------------

doc/source/deploy_install_guides/release/bare_metal/dedicated_storage_install_kubernetes.rst

@@ -23,6 +23,8 @@ Overview
 
 .. include:: /shared/_includes/desc_dedicated_storage.txt
 
+.. include:: /deploy_install_guides/release/bare_metal/automated-install-note--09dff208a9c6.rst 
+
 -----------------------------
 Minimum hardware requirements
 -----------------------------

doc/source/deploy_install_guides/release/bare_metal/ironic_install.rst

@@ -1,6 +1,6 @@
-================================
-Install Ironic on StarlingX R7.0
-================================
+==============================
+Install Ironic on StarlingX r9
+==============================
 
 .. include:: /_includes/ironic.rest
 
@@ -9,10 +9,10 @@ Install Ironic on StarlingX R7.0
 This section describes the steps to install Ironic on a standard configuration,
 either:
 
-* **StarlingX R7.0 bare metal Standard with Controller Storage** deployment
+* **StarlingX R9.0 bare metal Standard with Controller Storage** deployment
   configuration
 
-* **StarlingX R7.0 bare metal Standard with Dedicated Storage** deployment
+* **StarlingX R9.0 bare metal Standard with Dedicated Storage** deployment
   configuration
 
 .. contents::
@@ -142,7 +142,7 @@ To enable Ironic, update the following Ironic Helm Chart attributes:
       --set network.pxe.neutron_subnet_gateway=10.10.20.1 \
       --set network.pxe.neutron_provider_network=ironic-data
 
-:command:`network.pxe.neutron_subnet_alloc_start` sets the DHCP start IP to
+:command:`network.pxe.neutron_subnet_alloc_start` sets the |DHCP| start IP to
 Neutron for Ironic node provision, and reserves several IPs for the platform.
 
 If the data network name for Ironic is changed, modify

doc/source/deploy_install_guides/release/index-install-r7-8966076f0e81.rst

@@ -16,29 +16,34 @@ StarlingX provides a pre-defined set of standard :doc:`deployment
 configurations </introduction/deploy_options>`. Most deployment options may be
 installed in a virtual environment or on bare metal.
 
------------------------------------------------------
-Install StarlingX Kubernetes in a virtual environment
------------------------------------------------------
-
-.. toctree::
-   :maxdepth: 1
-
-   virtual/automated_install
-   virtual/aio_simplex
-   virtual/aio_duplex
-   virtual/controller_storage
-   virtual/dedicated_storage
-   virtual/rook_storage
+.. -----------------------------------------------------
+.. Install StarlingX Kubernetes in a virtual environment
+.. -----------------------------------------------------
+.. 
+.. .. toctree::
+..    :maxdepth: 1
+.. 
+..    virtual/automated_install
+..    virtual/aio_simplex
+..    virtual/aio_duplex
+..    virtual/controller_storage
+..    virtual/dedicated_storage
+..    virtual/rook_storage
 
 .. toctree::
    :hidden:
 
    virtual/config_virtualbox_netwk
    virtual/install_virtualbox
+   virtual/aio_duplex_environ
+   virtual/aio_simplex_environ
+   virtual/controller_storage_install_kubernetes
+   virtual/controller_storage_environ
 
-------------------------------------------
-Install StarlingX Kubernetes on bare metal
-------------------------------------------
+
+----------------------------
+Install StarlingX Kubernetes
+----------------------------
 
 .. toctree::
    :maxdepth: 1
@@ -49,6 +54,8 @@ Install StarlingX Kubernetes on bare metal
    bare_metal/rook_storage_install_kubernetes
    bare_metal/dedicated_storage_install_kubernetes
    bare_metal/ironic_install
+   virtual/automated_install
+   virtual/rook_storage
 
 -----------------
 Access Kubernetes

doc/source/index.rst

@@ -28,9 +28,9 @@ For more information about the StarlingX project, refer to the
 Introduction
 ------------
 
-To get started fast with StarlingX, try the
-:ref:`Virtual All-in-one Simplex Installation <virtual-aio-simplex>`, which
-requires a minimum of hardware and configuration.
+To get started fast with StarlingX, try the :ref:`Virtual All-in-one Simplex
+Installation <aio_simplex_install_kubernetes_r7>`, which requires a minimum of
+hardware and configuration.
 
 Learn more about StarlingX: