Update R4 OpenStack install guides

Follow-on to reviews 735349 & 735363, replicating R3 OpenStack install
guide changes.

Also editorial cleanup (change tabs to spaces).

Change-Id: I34088c127c632b46e9ad9e24cbf02ed7341c012d
Signed-off-by: MCamp859 <maryx.camp@intel.com>

doc/source/deploy_install_guides/r4_release/openstack/access.rst

@@ -72,10 +72,16 @@ in the external DNS server that owns `my-company.com`.
 Local CLI
 ---------
 
-Access OpenStack using the local CLI with the following steps:
+Access OpenStack using the local CLI with one of the following methods.
 
-#. Log in to controller-0 via the console or SSH with a sysadmin/<sysadmin-password>.
+**Method 1**
-   *Do not use* source /etc/platform/openrc .
+
+You can use this method on either controller, active or standby.
+
+#. Log in to the desired controller via the console or SSH with a
+   sysadmin/<sysadmin-password>.
+
+   **Do not** use ``source /etc/platform/openrc``.
 
 #. Set the CLI context to the StarlingX OpenStack Cloud Application and set up
    OpenStack admin credentials:
@@ -102,6 +108,30 @@ Access OpenStack using the local CLI with the following steps:
 
     export OS_CLOUD=openstack_helm
 
+**Method 2**
+
+Use this method to access StarlingX Kubernetes commands and StarlingX OpenStack
+commands in the same shell. You can only use this method on the active
+controller.
+
+#.  Log in to the active controller via the console or SSH with a
+    sysadmin/<sysadmin-password>.
+
+#.  Set the CLI context to the StarlingX OpenStack Cloud Application and set up
+    OpenStack admin credentials:
+
+    ::
+
+        sed '/export OS_AUTH_URL/c\export OS_AUTH_URL=http://keystone.openstack.svc.cluster.local/v3' /etc/platform/openrc > ~/openrc.os
+        source ./openrc.os
+
+    .. note::
+
+        To switch between StarlingX Kubernetes/Platform credentials and StarlingX
+        OpenStack credentials, use ``source /etc/platform/openrc`` or
+        ``source ./openrc.os`` respectively.
+
+
 **********************
 OpenStack CLI commands
 **********************
@@ -111,8 +141,34 @@ using the :command:`openstack` command. For example:
 
 ::
 
-	[sysadmin@controller-0 ~(keystone_admin)]$ openstack flavor list
+        controller-0:~$ export OS_CLOUD=openstack_helm
-	[sysadmin@controller-0 ~(keystone_admin)]$ openstack image list
+        controller-0:~$ openstack flavor list
+        controller-0:~$ openstack image list
+
+.. note::
+
+    If you are using Method 2 described above, use these commands:
+
+    ::
+
+        controller-0:~$ source ./openrc.os
+        controller-0:~$ openstack flavor list
+        controller-0:~$ openstack image list
+
+The image below shows a typical successful run.
+
+.. figure:: ../figures/starlingx-access-openstack-flavorlist.png
+   :alt: starlingx-access-openstack-flavorlist
+   :scale: 50%
+
+   *Figure 1: StarlingX OpenStack Flavorlist*
+
+
+.. figure:: ../figures/starlingx-access-openstack-command.png
+   :alt: starlingx-access-openstack-command
+   :scale: 50%
+
+   *Figure 2: StarlingX OpenStack Commands*
 
 ----------
 Remote CLI

doc/source/deploy_install_guides/r4_release/openstack/install.rst

@@ -16,9 +16,14 @@ Install application manifest and helm-charts
 --------------------------------------------
 
 #. Get the latest StarlingX OpenStack application (stx-openstack) manifest and
-   helm-charts. This can be from a private StarlingX build or from the public
+   helm charts. Use one of the following options:
+
+   *  Private StarlingX build. See :ref:`Build-stx-openstack-app` for details.
+   *  Public download from
       `CENGN StarlingX mirror <http://mirror.starlingx.cengn.ca/mirror/starlingx/>`_.
 
+      After you select a release, helm charts are located in ``centos/outputs/helm-charts``.
+
 #. Load the stx-openstack application's package into StarlingX. The tarball
    package contains stx-openstack's Airship Armada manifest and stx-openstack's
    set of helm charts. For example:
@@ -46,7 +51,7 @@ Install application manifest and helm-charts
    .. note::
 
         To set the HTTPS proxy at bootstrap time, refer to
-        `Ansible Bootstrap Configurations <https://docs.starlingx.io/deploy_install_guides/r3_release/ansible_bootstrap_configs.html#docker-proxy>`_.
+        `Ansible Bootstrap Configurations <https://docs.starlingx.io/deploy_install_guides/r4_release/ansible_bootstrap_configs.html#docker-proxy>`_.
 
         To set the HTTPS proxy after installation, refer to
         `Docker Proxy Configuration <https://docs.starlingx.io/configuration/docker_proxy_config.html>`_.