From 7354baacbebc19f7b85302ad3f38b0626495a14b Mon Sep 17 00:00:00 2001
From: Andrew Bays <abays@redhat.com>
Date: Fri, 15 Nov 2024 14:48:57 +0000
Subject: [PATCH] Support new OpenStack initialization resource for RHOSO
 install

---
 roles/kustomize_deploy/defaults/main.yml      | 18 ++++++++
 .../tasks/install_operators.yml               | 41 +++++++++++++++----
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/roles/kustomize_deploy/defaults/main.yml b/roles/kustomize_deploy/defaults/main.yml
index 1d14a72461..eefd888a7f 100644
--- a/roles/kustomize_deploy/defaults/main.yml
+++ b/roles/kustomize_deploy/defaults/main.yml
@@ -108,6 +108,24 @@ cifmw_kustomize_deploy_nmstate_dest_file: >-
     ] | path_join
   }}
 
+# openstack init resource
+cifmw_kustomize_deploy_openstack_source_files: >-
+  {{
+    [
+      cifmw_kustomize_deploy_architecture_repo_dest_dir,
+      cifmw_kustomize_deploy_architecture_examples_common_path,
+      'openstack'
+    ] | path_join
+  }}
+
+cifmw_kustomize_deploy_openstack_dest_file: >-
+  {{
+    [
+      cifmw_kustomize_deploy_kustomizations_dest_dir,
+      'openstack.yaml'
+    ] | path_join
+  }}
+
 # controlsplane resources
 
 cifmw_kustomize_deploy_nncp_source_files: >-
diff --git a/roles/kustomize_deploy/tasks/install_operators.yml b/roles/kustomize_deploy/tasks/install_operators.yml
index 8be1a7500f..6a94089930 100644
--- a/roles/kustomize_deploy/tasks/install_operators.yml
+++ b/roles/kustomize_deploy/tasks/install_operators.yml
@@ -319,17 +319,45 @@
           status: "True"
         wait_timeout: 300
 
+- name: Generate OpenStack initialization kustomization file
+  ansible.builtin.copy:
+    content: >-
+      {{
+        lookup(
+          'kubernetes.core.kustomize',
+          dir=cifmw_kustomize_deploy_openstack_source_files
+        )
+      }}
+    dest: "{{ cifmw_kustomize_deploy_openstack_dest_file }}"
+    mode: "0644"
+
+- name: Openstack initialization resources
+  when: not cifmw_kustomize_deploy_generate_crs_only
+  block:
+    - name: Apply the kustomized OpenStack initialization CRs
+      kubernetes.core.k8s:
+        kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
+        api_key: "{{ cifmw_openshift_token | default(omit) }}"
+        context: "{{ cifmw_openshift_context | default(omit) }}"
+        state: present
+        wait: true
+        src: "{{ cifmw_kustomize_deploy_openstack_dest_file }}"
+      check_mode: >-
+        {{
+          cifmw_kustomize_deploy_check_mode |
+          default(false, true)
+        }}
+
 - name: Wait until OpenStack operators are deployed and ready
   when: not cifmw_kustomize_deploy_generate_crs_only
   kubernetes.core.k8s_info:
     kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
-    kind: Deployment
+    kind: Openstack
     namespace: openstack-operators
-    label_selectors:
-      - "{{ item }}"
+    name: openstack
     wait: true
     wait_condition:
-      type: Available
+      type: Ready
       status: "True"
     wait_timeout: 600
   check_mode: >-
@@ -337,8 +365,3 @@
       cifmw_kustomize_deploy_check_mode |
       default(false, true)
     }}
-  with_items:
-    - openstack.org/operator-name
-    # The RabbitMQ operator does not share our openstack.org/operator-name label
-    # and must be checked independently
-    - app.kubernetes.io/name=rabbitmq-cluster-operator