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/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/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;

roles/cifmw_setup/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-openstack_namespace: openstack
+cifmw_openstack_namespace: openstack

roles/cifmw_setup/tasks/deploy_architecture.yml

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

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"

scenarios/centos-9/edpm_ci.yml

@@ -41,4 +41,3 @@ post_ctlplane_deploy:
       podified_validation: "{{ podified_validation | default (false) | bool }}"
       cifmw_openshift_kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
       cifmw_path: "{{ cifmw_path }}"
-      openstack_namespace: "{{ cifmw_install_yamls_defaults['NAMESPACE'] }}"