Merge pull request #1018 from tosky/cinder-netapp-backend

cinder netapp+doc: use the source configuration group name

Author: openshift-merge-bot[bot]

docs_user/modules/proc_adopting-the-block-storage-service.adoc

@@ -161,6 +161,11 @@ spec:
             report_discard_supported=True
 ----
 +
+[NOTE]
+====
+Ensure that you use the same configuration group name for the driver that you used in the source cluster. In this example, the driver configuration group in `customServiceConfig` is called `tripleo_ceph` because it reflects the value of the configuration group name in the `cinder.conf` file of the source OpenStack cluster.
+====
++
 . Configure the NetApp NFS Block Storage volume service:
 .. Create secrets that include sensitive information such as hostnames, passwords, and usernames to access the third-party NetApp NFS storage. You can find the credentials in the `cinder.conf` file that was generated from the {OpenStackPreviousInstaller} deployment.
 +
@@ -177,7 +182,7 @@ metadata:
 type: Opaque
 stringData:
   ontap-cinder-secrets: |
-    [ontap-nfs]
+    [tripleo_netapp]
     netapp_login= netapp_username
     netapp_password= netapp_password
     netapp_vserver= netapp_vserver
@@ -205,7 +210,7 @@ spec:
           networkAttachments:
             - storage
           customServiceConfig: |
-            [ontap-nfs]
+            [tripleo_netapp]
             volume_backend_name=ontap-nfs
             volume_driver=cinder.volume.drivers.netapp.common.NetAppDriver
             nfs_snapshot_support=true
@@ -223,13 +228,13 @@ spec:
 ----
 $ openstack volume service list
 
-+------------------+------------------------+------+---------+-------+----------------------------+
-| Binary           | Host                   | Zone | Status  | State | Updated At                 |
-+------------------+------------------------+------+---------+-------+----------------------------+
-| cinder-volume    | hostgroup@tripleo_ceph | nova | enabled | up    | 2023-06-28T17:00:03.000000 |
-| cinder-scheduler | cinder-scheduler-0     | nova | enabled | up    | 2023-06-28T17:00:02.000000 |
-| cinder-backup    | cinder-backup-0        | nova | enabled | up    | 2023-06-28T17:00:01.000000 |
-+------------------+------------------------+------+---------+-------+----------------------------+
++------------------+--------------------------+------+---------+-------+----------------------------+
+| Binary           | Host                     | Zone | Status  | State | Updated At                 |
++------------------+--------------------------+------+---------+-------+----------------------------+
+| cinder-volume    | hostgroup@tripleo_netapp | nova | enabled | up    | 2023-06-28T17:00:03.000000 |
+| cinder-scheduler | cinder-scheduler-0       | nova | enabled | up    | 2023-06-28T17:00:02.000000 |
+| cinder-backup    | cinder-backup-0          | nova | enabled | up    | 2023-06-28T17:00:01.000000 |
++------------------+--------------------------+------+---------+-------+----------------------------+
 ----
 
 . Apply the DB data migrations:

tests/roles/cinder_adoption/tasks/cinder_volume_netapp_nfs.yaml

@@ -32,6 +32,12 @@
           - 'Missing required Netapp input'
 
     - name: Render Netapp OpenShift Secret template
+      ansible.builtin.template:
+        src: "{{ role_path }}/templates/cinder_volume_netapp_nfs.yaml.j2"
+        dest: /tmp/cinder_volume_netapp_nfs.yaml
+        mode: "0600"
+
+    - name: Render cinder netapp NFS OpenShift patch file template
       ansible.builtin.template:
         src: "{{ role_path }}/templates/cinder-volume-ontap-secrets.yaml.j2"
         dest: /tmp/cinder-volume-ontap-secrets.yaml
@@ -47,4 +53,4 @@
       ansible.builtin.shell: |
         {{ shell_header }}
         {{ oc_header }}
-        oc patch openstackcontrolplane openstack --type=merge --patch-file={{ role_path }}/files/cinder_volume_netapp_nfs.yaml
+        oc patch openstackcontrolplane openstack --type=merge --patch-file=/tmp/cinder_volume_netapp_nfs.yaml

tests/roles/cinder_adoption/templates/cinder-volume-ontap-secrets.yaml.j2

@@ -10,7 +10,7 @@ metadata:
 type: Opaque
 stringData:
   ontap-cinder-secrets: |
-    [ontap-nfs]
+    [{{ cinder_netapp_backend }}]
     netapp_server_hostname = {{ cinder_volume_netapp_config.netapp_server_hostname }}
     netapp_login = {{ cinder_volume_netapp_config.netapp_login }}
     netapp_password = {{ cinder_volume_netapp_config.netapp_password }}

…tion/files/cinder_volume_netapp_nfs.yaml …mplates/cinder_volume_netapp_nfs.yaml.j2tests/roles/cinder_adoption/files/cinder_volume_netapp_nfs.yaml renamed to tests/roles/cinder_adoption/templates/cinder_volume_netapp_nfs.yaml.j2 tests/roles/cinder_adoption/files/cinder_volume_netapp_nfs.yaml renamed to tests/roles/cinder_adoption/templates/cinder_volume_netapp_nfs.yaml.j2

@@ -6,7 +6,7 @@ spec:
           networkAttachments:
             - storage
           customServiceConfig: |
-            [ontap-nfs]
+            [{{ cinder_netapp_backend }}]
             volume_backend_name=ontap-nfs
             volume_driver=cinder.volume.drivers.netapp.common.NetAppDriver
             netapp_storage_protocol=nfs