Consolidate openstack ns var: cifmw_openstack_namespace

There are multiple variables related to openstack namespace in OCP. This commit tries to consolidate them all with a single variable defined in group_vars. At some places, ns var were being read from cifmw_install_yamls_defaults and they are left unchanged.

Signed-off-by: Amartya Sinha <amsinha@redhat.com>

Author: amartyasinha

group_vars/all.yml

@@ -10,3 +10,5 @@ cifmw_installyamls_repos_relative: src/github.com/openstack-k8s-operators/instal
 cifmw_installyamls_repos: "{{ ansible_user_dir }}/{{ cifmw_installyamls_repos_relative }}"
 cifmw_architecture_repo_relative: src/github.com/openstack-k8s-operators/architecture
 cifmw_architecture_repo: "{{ ansible_user_dir }}/{{ cifmw_architecture_repo_relative }}"
+
+cifmw_openstack_namespace: openstack

roles/shiftstack/molecule/default/cleanup.yml

@@ -19,7 +19,6 @@
   vars:
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
     cifmw_openshift_kubeconfig: "{{ ansible_user_dir  }}/.crc/machines/crc/kubeconfig"
-    openstack_namespace_name: openstack
   tasks:
     - name: Include the shiftstack role and run the cleanup
       ansible.builtin.include_role:
@@ -34,4 +33,4 @@
           apiVersion: v1
           kind: Namespace
           metadata:
-            name: "{{ openstack_namespace_name }}"
+            name: "{{ cifmw_openstack_namespace }}"

roles/shiftstack/molecule/default/prepare.yml

@@ -20,7 +20,6 @@
   vars:
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
     cifmw_openshift_kubeconfig: "{{ ansible_user_dir  }}/.crc/machines/crc/kubeconfig"
-    openstack_namespace_name: openstack
     openstack_config_name: openstack-config
     openstack_config_secret_name: openstack-config-secret
     openstack_root_ca_secret_name: rootca-public
@@ -40,7 +39,7 @@
           apiVersion: v1
           kind: Namespace
           metadata:
-            name: "{{ openstack_namespace_name }}"
+            name: "{{ cifmw_openstack_namespace }}"
 
     - name: Create a dummy configmap
       kubernetes.core.k8s:
@@ -51,7 +50,7 @@
           kind: ConfigMap
           metadata:
             name: "{{ openstack_config_name }}"
-            namespace: "{{ openstack_namespace_name }}"
+            namespace: "{{ cifmw_openstack_namespace }}"
           data:
             key1: dummy1
             key2: dummy2
@@ -65,7 +64,7 @@
           kind: Secret
           metadata:
             name: "{{ openstack_config_secret_name }}"
-            namespace: "{{ openstack_namespace_name }}"
+            namespace: "{{ cifmw_openstack_namespace }}"
           type: Opaque
           data:
             secure.yaml: ZHVtbXkK # Base64 encoded value of "dummy"
@@ -79,7 +78,7 @@
           kind: Secret
           metadata:
             name: "{{ openstack_root_ca_secret_name }}"
-            namespace: "{{ openstack_namespace_name }}"
+            namespace: "{{ cifmw_openstack_namespace }}"
           type: Opaque
           data:
             ca.crt: ZHVtbXkK # Base64 encoded value of "dummy"