Merge pull request #88 from PureStorage-OpenConnect/update_manila_rhoso

Update manila RHOSO docs

Author: sdodsley

source/manila/configuration/manila_config_files/section_rhoso18_flashblade_configuration.rst

@@ -16,11 +16,6 @@ deploy single or multiple FlashBlade manila back ends in a RHOSO cluster.
   For more information about RHOSO, please refer to its `documentation pages
   <https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/18.0-beta/html/deploying_red_hat_openstack_services_on_openshift/index>`_.
 
-.. warning::
-
-  RHOSO18.0 is based on OpenStack 2023.1 (Antelope) release with 2023.2 (Bobcat) backports. Features
-  included after Antelope release may not be available in RHOSO18.0.
-
 Requirements
 ------------
 
@@ -42,8 +37,28 @@ Use Certified Pure Storage Manila Share Image
 Red Hat requires that you utilize the Certified Pure Storage Manila Share
 Image when deploying RHOSO18.0 with a Pure Storage FlashArray backend.
 
-This container can be found in the `Red Hat Container Catalog <https://catalog.redhat.com/search?searchType=containers&partnerName=Pure%20Storage%2C%20Inc.&p=1>`__
-and should be stored in a local registry.
+This container can be found in the `Red Hat Container Catalog <https://catalog.redhat.com/search?searchType=containers&partnerName=Pure%20Storage%2C%20Inc.&p=1>`__.
+
+Ensure the certified image is added to the ``openstackversion`` CR.  This is defined in the following YAML file (``openstack_version.yaml``):
+
+.. code-block:: yaml
+  :name: manila-openstackversion
+
+  apiVersion: core.openstack.org/v1beta1
+  kind: OpenStackVersion
+  metadata:
+    name: openstack
+  spec:
+    customContainerImages:
+      manilaShareImages:
+        flashblade: registry.connect.redhat.com/purestorage/openstack-manila-share-pure-18-0
+
+Save this file and update:
+
+.. code-block:: bash
+   :name: manila-openstackversion-apply
+
+   $ oc apply -f openstack-version.yaml
 
 Create a Secret file
 ^^^^^^^^^^^^^^^^^^^^
@@ -71,33 +86,11 @@ Create the OpenShift secret based on the above configuration file:
 
 For security, you may now delete the configuration file.
 
-Create an OpenStackVersion config file
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-As previously mentioned, it is required, when using FlashBlades as Manila
-backends, that a certified Manila Share image is used within the RHOSO
-deployment. This is defined in the following YAML file (``pure-m-shr-image.yaml``):
-
-.. code-block:: yaml
-  :name: manila-pure-openstackversion
-
-  apiVersion: core.openstack.org/v1beta1
-  kind: OpenStackVersion
-  metadata:
-    name: openstack
-  spec:
-    customContainerImages:
-      manilaShareImages:
-        flashblade: registry.connect.redhat.com/purestorage/openstack-manila-share-pure-18-0
-
-In this example the image is being pulled directly from the Red Hat image registry, but you
-may use a copy in your local image registry created by the OpenShift deployment.
-
 Update the OpenStack Control Plane
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Create the following file (``pure-m-shr-config.yaml``) to update the OpenStack
-control plane with the FlashBlade manila backend(s):
+Open your OpenStackControlPlane CR file, ``openstack_control_plane.yaml``. Edit the CR file and add in the
+Pure Storage Cinder volume backend.
 
 .. code-block:: yaml
   :name: manila-pure-openstackcontrolplane
@@ -122,8 +115,9 @@ control plane with the FlashBlade manila backend(s):
           flashblade:
             networkAttachments:
             - storage
+            - storageMgmt
             customServiceConfigSecrets:
-            - pure-fb-_secret
+            - pure-fb-secret
             customServiceConfig: |
               [DEFAULT]
               debug = true
@@ -134,19 +128,13 @@ control plane with the FlashBlade manila backend(s):
               share_driver=manila.share.drivers.purestorage.flashblade.FlashBladeShareDriver
 
 
-Apply the custom configurations
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-After ensuring that you full admininstrative access to the OpenShift cluster, apply
-the above configuration files:
+Save this file and update:
 
 .. code-block:: bash
-  :name: pure-manila-apply
-
-  $ oc apply -f ./pure-secrets.yaml
-  $ oc apply -f ./pure-m-shr-image.yaml
-  $ oc apply -f ./pure-m-shr-config.yaml
+   :name: manila-openstackversion-apply
 
+   $ oc apply -f openstack_control_plane.yaml
+   
 Test the Deployed Back Ends
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -156,22 +144,21 @@ Manila services are up:
 .. code-block:: bash
   :name: manila-service-list
 
-  $ export OS_CLOUD=<your cloud name>
-  $ export OS_PASSWORD=<your password>
-  $ openstack share service list
+  $ oc rsh openstackclient
+  sh-5.1$ openstack share service list
 
 
 Run the following commands to create the share types mapped to the deployed back ends:
 
 .. code-block:: bash
   :name: create-share-types
 
-  $ openstack share type create --snapshot_support true ---revert_to_snapshot_support true flashblade false
+  sh-5.1$ openstack share type create --snapshot_support true ---revert_to_snapshot_support true flashblade false
 
 Make sure that you're able to create Manila shares with the configured volume
 types:
 
 .. code-block:: bash
   :name: create-shares
 
-  $ openstack share create --share-type flashblade --name testshare NFS 1
+  sh-5.1$ openstack share create --share-type flashblade --name testshare NFS 1