Merge pull request openstack-k8s-operators#981 from tosky/cinder-adoption-fix-variable

cinder, manila: various fixes (undef vars, file perms, extra net)

Author: openshift-merge-bot[bot]

tests/roles/cinder_adoption/files/cinder_volume_netapp_nfs.yaml

@@ -5,7 +5,6 @@ spec:
         ontap-nfs:
           networkAttachments:
             - storage
-            - storageMgmt
           customServiceConfig: |
             [ontap-nfs]
             volume_backend_name=ontap-nfs

tests/roles/cinder_adoption/tasks/cinder_volume_netapp_nfs.yaml

@@ -4,10 +4,10 @@
       become: true
       ansible.builtin.shell: |
         {{ shell_header }}
-        {{ controller_ssh }}
         CONTROLLER1_SCP="{{ controller1_ssh  | regex_replace('^ssh', 'scp')}}"
         ${CONTROLLER1_SCP}:{{ cinder_tripleo_path }} {{ cinder_conf_path }}
         ${CONTROLLER1_SCP}:{{ cinder_tripleo_nfs_shares_config_path }} {{ cinder_nfs_shares_conf_path }}
+        chmod a+r {{ cinder_conf_path }} {{ cinder_nfs_shares_conf_path }}
 
     - name: Extract Netapp data from cinder.conf
       ansible.builtin.set_fact:

tests/roles/manila_adoption/tasks/netapp.yaml

@@ -4,9 +4,9 @@
       become: true
       ansible.builtin.shell: |
         {{ shell_header }}
-        {{ controller_ssh }}
         CONTROLLER1_SCP="{{ controller1_ssh  | regex_replace('^ssh', 'scp')}}"
         ${CONTROLLER1_SCP}:{{ manila_tripleo_path }} {{ manila_conf_path }}
+        chmod a+r {{ manila_conf_path }}
 
     - name: Stat the retrieved manila.conf file
       ansible.builtin.stat: