Merge pull request #1063 from ashu-011/swift_fix

Add Storagemgmt network attachment to Swift CR

Author: openshift-merge-bot[bot]

tests/roles/swift_adoption/defaults/main.yaml

@@ -11,7 +11,11 @@ swift_patch: |
         swiftStorage:
           replicas: 0
           networkAttachments:
-          - storage
+            - storage
+            {% if storagemgmt_available | default(false) -%}
+            - storagemgmt
+            {%- endif %}
+
           storageClass: {{ storage_class_name }}
           storageRequest: 10Gi
         swiftProxy:
@@ -36,5 +40,9 @@ swift_patch: |
                 spec:
                   type: LoadBalancer
           networkAttachments:
-          - storage
+            - storage
+            {% if storagemgmt_available | default(false) -%}
+            - storagemgmt
+            {%- endif %}
+
 swift_retry_delay: 5

tests/roles/swift_adoption/tasks/main.yaml

@@ -30,6 +30,22 @@
       object.ring.gz: $($CONTROLLER1_SSH "base64 -w0 /var/lib/config-data/puppet-generated/swift/etc/swift/object.ring.gz")
     EOF
 
+- name: Check if storagemgmt NetworkAttachmentDefinition exists
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    oc get network-attachment-definitions storagemgmt
+  register: storagemgmt_nad_check
+  failed_when: false
+
+- name: Set storagemgmt_available variable
+  ansible.builtin.set_fact:
+    storagemgmt_available: "{{ storagemgmt_nad_check.rc == 0 }}"
+
+- name: Debug storagemgmt availability
+  ansible.builtin.debug:
+    msg: "storagemgmt NetworkAttachmentDefinition available: {{ storagemgmt_available }}"
+
 - name: Deploy podified Swift
   ansible.builtin.shell: |
     {{ shell_header }}