[multiple] 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, thus it is being used as the value for cifmw_openstack_namespace var in group_vars along with default value of openstack.

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: "{{ cifmw_install_yamls_defaults['NAMESPACE'] | default('openstack') }}"

hooks/playbooks/apply_cinder_replication_kustomization.yml

@@ -30,7 +30,7 @@
         KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
         PATH: "{{ cifmw_path }}"
       ansible.builtin.command:
-        cmd: oc get openstackcontrolplane -n openstack -o yaml
+        cmd: "oc get openstackcontrolplane -n {{ cifmw_openstack_namespace }} -o yaml"
       register: current_controlplane_config
 
     - name: Parse existing Cinder backend configuration
@@ -58,7 +58,7 @@
           kind: OpenStackControlPlane
           metadata:
             name: controlplane
-            namespace: openstack
+            namespace: "{{ cifmw_openstack_namespace }}"
           spec:
             cinder:
               template:
@@ -70,4 +70,4 @@
         KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
         PATH: "{{ cifmw_path }}"
       ansible.builtin.command:
-        cmd: oc wait --for=condition=Ready openstackcontrolplane/controlplane -n openstack --timeout=1200s
+        cmd: "oc wait --for=condition=Ready openstackcontrolplane/controlplane -n {{ cifmw_openstack_namespace }} --timeout=1200s"

hooks/playbooks/delete_all_pre_adoption_resources.yaml

@@ -14,7 +14,7 @@
     - name: Fetch cloud config to host
       kubernetes.core.k8s_cp:
         kubeconfig: "{{ cifmw_resource_delete_kubeconfig }}"
-        namespace: openstack
+        namespace: "{{ cifmw_openstack_namespace }}"
         pod: openstackclient
         remote_path: /home/cloud-admin/.config/openstack/
         local_path: "/home/zuul/.config/openstack/"

hooks/playbooks/dz_storage_post_deploy_az.yaml

@@ -11,7 +11,7 @@
         PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
       ansible.builtin.command: >-
         oc rsh
-        -n openstack
+        -n "{{ cifmw_openstack_namespace }}"
         openstackclient
         openstack project show service -c id -f value
       register: service_project_result
@@ -26,7 +26,7 @@
         PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
       ansible.builtin.command: >-
         oc rsh
-        -n openstack
+        -n "{{ cifmw_openstack_namespace }}"
         openstackclient
         openstack volume type create --private
         --project "{{ service_project_id }}"
@@ -44,7 +44,7 @@
         PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
       ansible.builtin.command: >-
         oc rsh
-        -n openstack
+        -n "{{ cifmw_openstack_namespace }}"
         openstackclient
         openstack aggregate create {{ item }} --zone {{ item }}
       loop:
@@ -59,7 +59,7 @@
         PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
       ansible.builtin.command: >-
         oc rsh
-        -n openstack
+        -n "{{ cifmw_openstack_namespace }}"
         openstackclient
         openstack aggregate add host {{ item.az }} {{ item.host }}
       loop:

hooks/playbooks/dz_storage_pre_test_images.yaml

@@ -8,15 +8,14 @@
     cirros_version: "0.6.2"
     cirros_image_name: "cirros-{{ cirros_version }}-x86_64-disk.img"
     cirros_download_url: "https://github.com/cirros-dev/cirros/releases/download/{{ cirros_version }}/{{ cirros_image_name }}"
-    openstack_namespace: "{{ cifmw_openstack_namespace | default('openstack') }}"
   tasks:
     - name: Check if cirros image already exists
       environment:
         KUBECONFIG: "{{ cifmw_openshift_kubeconfig | default('/home/' + ansible_user | default('zuul') + '/.kube/config') }}"
         PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
       ansible.builtin.command: >-
         oc rsh
-        -n {{ openstack_namespace }}
+        -n {{ cifmw_openstack_namespace }}
         openstackclient
         openstack image show {{ cirros_image_name }}
       register: _image_exists
@@ -31,7 +30,7 @@
             PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
           ansible.builtin.command: >-
             oc rsh
-            -n {{ openstack_namespace }}
+            -n {{ cifmw_openstack_namespace }}
             openstackclient
             openstack endpoint list --service keystone --interface public -f value -c URL
           register: keystone_url
@@ -41,7 +40,7 @@
             KUBECONFIG: "{{ cifmw_openshift_kubeconfig | default('/home/' + ansible_user | default('zuul') + '/.kube/config') }}"
             PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
           ansible.builtin.command: >-
-            oc get secret osp-secret -n {{ openstack_namespace }} -o jsonpath='{.data.AdminPassword}'
+            oc get secret osp-secret -n {{ cifmw_openstack_namespace }} -o jsonpath='{.data.AdminPassword}'
           register: admin_password_b64
 
         - name: Decode admin password
@@ -61,15 +60,15 @@
           ansible.builtin.command: >-
             oc cp
             "/tmp/{{ cirros_image_name }}"
-            "{{ openstack_namespace }}/openstackclient:/home/cloud-admin/{{ cirros_image_name }}"
+            "{{ cifmw_openstack_namespace }}/openstackclient:/home/cloud-admin/{{ cirros_image_name }}"
 
         - name: Create cirros image in default glance store (az0)
           environment:
             KUBECONFIG: "{{ cifmw_openshift_kubeconfig | default('/home/' + ansible_user | default('zuul') + '/.kube/config') }}"
             PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
           ansible.builtin.command: >-
             oc rsh
-            -n {{ openstack_namespace }}
+            -n {{ cifmw_openstack_namespace }}
             openstackclient
             openstack image create
             --disk-format qcow2
@@ -85,7 +84,7 @@
             PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
           ansible.builtin.command: >-
             oc rsh
-            -n {{ openstack_namespace }}
+            -n {{ cifmw_openstack_namespace }}
             openstackclient
             openstack image show {{ cirros_image_name }} -f value -c status
           register: image_status
@@ -99,7 +98,7 @@
             PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
           ansible.builtin.command: >-
             oc rsh
-            -n {{ openstack_namespace }}
+            -n {{ cifmw_openstack_namespace }}
             openstackclient
             openstack image show {{ cirros_image_name }} -f value -c id
           register: image_id
@@ -110,7 +109,7 @@
             PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
           ansible.builtin.command: >-
             oc rsh
-            -n {{ openstack_namespace }}
+            -n {{ cifmw_openstack_namespace }}
             openstackclient
             glance --os-auth-url {{ keystone_url.stdout | trim }}
             --os-project-name admin
@@ -128,7 +127,7 @@
             PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
           ansible.builtin.command: >-
             oc rsh
-            -n {{ openstack_namespace }}
+            -n {{ cifmw_openstack_namespace }}
             openstackclient
             openstack image show {{ image_id.stdout | trim }} -c properties -f value
           register: image_stores

hooks/playbooks/ipa-controlplane-config.yml

@@ -66,7 +66,7 @@
           kind: Secret
           metadata:
             name: keystone-domains
-            namespace: openstack
+            namespace: "{{ cifmw_openstack_namespace }}"
           type: Opaque
           stringData: "{{ {keystone_conf_key: keystone_ldap_config_content} }}"
       vars:

hooks/playbooks/run_tofu.yml

@@ -29,7 +29,7 @@
     - name: Fetch cloud congig to host
       kubernetes.core.k8s_cp:
         kubeconfig: "{{ cifmw_tofu_kubeconfig }}"
-        namespace: openstack
+        namespace: "{{ cifmw_openstack_namespace }}"
         pod: openstackclient
         remote_path: /home/cloud-admin/.config/openstack/
         local_path: "{{ ansible_user_dir }}/.config/openstack/"

hooks/playbooks/validate_podified_deployment.yml

@@ -8,7 +8,7 @@
         KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
         PATH: "{{ cifmw_path }}"
       ansible.builtin.shell: |
-        oc get pods -n {{ openstack_namespace }} --selector service=nova-api -o jsonpath={.items[*].status.phase}
+        oc get pods -n {{ cifmw_openstack_namespace }} --selector service=nova-api -o jsonpath={.items[*].status.phase}
       register: nova_service
       until: nova_service.stdout == "Running"
       changed_when: false
@@ -22,5 +22,5 @@
         KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
         PATH: "{{ cifmw_path }}"
       ansible.builtin.shell: |
-        oc rsh -n {{ openstack_namespace }} openstackclient openstack compute service list;
-        oc rsh -n {{ openstack_namespace }} openstackclient openstack network agent list;
+        oc rsh -n {{ cifmw_openstack_namespace }} openstackclient openstack compute service list;
+        oc rsh -n {{ cifmw_openstack_namespace }} openstackclient openstack network agent list;

playbooks/06-deploy-architecture.yml

@@ -281,7 +281,7 @@
         PATH: "{{ cifmw_path }}"
       ansible.builtin.command: >-
         oc rsh
-        -n openstack
+        -n "{{ cifmw_openstack_namespace }}"
         nova-cell0-conductor-0
         nova-manage cell_v2 discover_hosts --verbose
 

roles/ci_dcn_site/tasks/add_node.yml

@@ -107,7 +107,7 @@
 - name: Run Nova cell discovery for new DCN hosts
   kubernetes.core.k8s_exec:
     api_key: "{{ _auth_results.openshift_auth.api_key }}"
-    namespace: openstack
+    namespace: "{{ cifmw_openstack_namespace }}"
     pod: nova-cell0-conductor-0
     command: nova-manage cell_v2 discover_hosts --verbose