From ee3f29a74f72802a25728d305a429a79a410e728 Mon Sep 17 00:00:00 2001 From: Amartya Sinha Date: Thu, 4 Dec 2025 15:42:50 +0530 Subject: [PATCH] [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 --- group_vars/all.yml | 2 + ...apply_cinder_replication_kustomization.yml | 6 +-- .../delete_all_pre_adoption_resources.yaml | 2 +- .../playbooks/dz_storage_post_deploy_az.yaml | 8 ++-- .../playbooks/dz_storage_pre_test_images.yaml | 19 +++++----- hooks/playbooks/install_custom_ca_certs.yaml | 3 +- hooks/playbooks/ipa-controlplane-config.yml | 2 +- hooks/playbooks/ironic_enroll_nodes.yml | 5 +-- hooks/playbooks/ironic_flavor.yml | 3 +- hooks/playbooks/ironic_network.yml | 5 +-- .../ironic_network_agent_cleanup.yml | 4 +- hooks/playbooks/run_tofu.yml | 2 +- .../validate_podified_deployment.yml | 6 +-- playbooks/06-deploy-architecture.yml | 2 +- roles/ci_dcn_site/tasks/add_node.yml | 2 +- roles/ci_dcn_site/tasks/az.yml | 6 +-- roles/ci_dcn_site/tasks/deploy_site.yml | 2 +- roles/ci_dcn_site/tasks/remove_node.yml | 24 ++++++------ roles/ci_dcn_site/tasks/scaledown_site.yml | 38 +++++++++---------- .../templates/ceph_secrets.yaml.j2 | 2 +- .../molecule/default/nads_output.yml | 6 +-- .../cifmw_cephadm/tasks/configure_object.yml | 2 +- roles/cifmw_setup/defaults/main.yml | 2 +- .../cifmw_setup/tasks/deploy_architecture.yml | 2 +- roles/cleanup_openstack/tasks/main.yaml | 2 +- .../hook_multirealm_controlplane_config.yml | 2 +- .../files/minimal_openstack_controlplane.yml | 2 +- roles/install_openstack_ca/tasks/main.yml | 2 +- .../molecule/osp_secrets/converge.yml | 4 +- roles/os_must_gather/defaults/main.yml | 2 +- roles/run_hook/tasks/playbook.yml | 7 +--- roles/shiftstack/molecule/default/cleanup.yml | 3 +- roles/shiftstack/molecule/default/prepare.yml | 9 ++--- roles/shiftstack/tasks/cleanup.yml | 2 +- ...kclient_incluster_kubeconfig_secret.yml.j2 | 2 +- .../templates/shiftstackclient_pvc.yml.j2 | 2 +- roles/tempest/tasks/create-clouds-file.yml | 4 +- roles/test_operator/defaults/main.yml | 2 +- .../tasks/collect_openstackclient_config.yml | 2 +- .../tasks/create_local_openstackclient.yml | 2 +- scenarios/centos-9/edpm_ci.yml | 1 - 41 files changed, 96 insertions(+), 109 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index b55c0b3931..ab8684d80b 100644 --- a/group_vars/all.yml +++ b/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') }}" diff --git a/hooks/playbooks/apply_cinder_replication_kustomization.yml b/hooks/playbooks/apply_cinder_replication_kustomization.yml index 8626e0b932..dbff15193b 100644 --- a/hooks/playbooks/apply_cinder_replication_kustomization.yml +++ b/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" diff --git a/hooks/playbooks/delete_all_pre_adoption_resources.yaml b/hooks/playbooks/delete_all_pre_adoption_resources.yaml index 3ae88f2bb4..8a9c5c17ce 100644 --- a/hooks/playbooks/delete_all_pre_adoption_resources.yaml +++ b/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/" diff --git a/hooks/playbooks/dz_storage_post_deploy_az.yaml b/hooks/playbooks/dz_storage_post_deploy_az.yaml index 28cc88c8f8..46e9bc4e9b 100644 --- a/hooks/playbooks/dz_storage_post_deploy_az.yaml +++ b/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: diff --git a/hooks/playbooks/dz_storage_pre_test_images.yaml b/hooks/playbooks/dz_storage_pre_test_images.yaml index c5feb6a7ce..f05a14be9f 100644 --- a/hooks/playbooks/dz_storage_pre_test_images.yaml +++ b/hooks/playbooks/dz_storage_pre_test_images.yaml @@ -8,7 +8,6 @@ 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: @@ -16,7 +15,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 }} 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,7 +60,7 @@ 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: @@ -69,7 +68,7 @@ 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 diff --git a/hooks/playbooks/install_custom_ca_certs.yaml b/hooks/playbooks/install_custom_ca_certs.yaml index a56357ee87..87e35b4627 100644 --- a/hooks/playbooks/install_custom_ca_certs.yaml +++ b/hooks/playbooks/install_custom_ca_certs.yaml @@ -5,7 +5,6 @@ connection: local vars: _custom_ca_cert_filepath: "{{ custom_ca_cert_filepath | default('/tmp/ca_cert.txt') }}" - _namespace: "{{ namespace | default('openstack') }}" tasks: - name: Download cert ansible.builtin.get_url: @@ -33,6 +32,6 @@ type: Opaque metadata: name: custom-ca-certs - namespace: "{{ _namespace }}" + namespace: "{{ cifmw_openstack_namespace }}" data: CustomCACerts: "{{ custom_ca_certs.content }}" diff --git a/hooks/playbooks/ipa-controlplane-config.yml b/hooks/playbooks/ipa-controlplane-config.yml index 75a02cca85..97c74ed1b0 100644 --- a/hooks/playbooks/ipa-controlplane-config.yml +++ b/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: diff --git a/hooks/playbooks/ironic_enroll_nodes.yml b/hooks/playbooks/ironic_enroll_nodes.yml index f982d8e22b..43319ce02c 100644 --- a/hooks/playbooks/ironic_enroll_nodes.yml +++ b/hooks/playbooks/ironic_enroll_nodes.yml @@ -4,7 +4,6 @@ gather_facts: false vars: _baremetal_info_path: "{{ cifmw_basedir }}/parameters/baremetal-info.yml" - _namespace: openstack _ironic_node_name_prefix: ironic- _ironic_network_interface: flat _ironic_network_physical_network: ironic @@ -67,7 +66,7 @@ - name: Enroll ironic nodes ansible.builtin.shell: | set -xe -o pipefail - oc project {{ _namespace }} - oc cp {{ cifmw_basedir }}/parameters/ironic_nodes.yaml {{ _namespace }}/openstackclient:/tmp/ + oc project {{ cifmw_openstack_namespace }} + oc cp {{ cifmw_basedir }}/parameters/ironic_nodes.yaml {{ cifmw_openstack_namespace }}/openstackclient:/tmp/ oc rsh openstackclient \ openstack baremetal create /tmp/ironic_nodes.yaml diff --git a/hooks/playbooks/ironic_flavor.yml b/hooks/playbooks/ironic_flavor.yml index 874a48be1e..e867196392 100644 --- a/hooks/playbooks/ironic_flavor.yml +++ b/hooks/playbooks/ironic_flavor.yml @@ -3,7 +3,6 @@ hosts: "{{ cifmw_target_hook_host | default('localhost') }}" gather_facts: false vars: - _namespace: openstack _flavor_name: baremetal _flavor_id: 123456789-1234-1234-1234-000000000001 _boot_mode: uefi @@ -14,7 +13,7 @@ - name: Create baremetal flavor ansible.builtin.shell: | set -xe -o pipefail - oc project {{ _namespace }} + oc project {{ cifmw_openstack_namespace }} oc rsh openstackclient \ openstack flavor create {{ _flavor_name }} \ --id {{ _flavor_id }} \ diff --git a/hooks/playbooks/ironic_network.yml b/hooks/playbooks/ironic_network.yml index 893c413c89..14f55265e4 100644 --- a/hooks/playbooks/ironic_network.yml +++ b/hooks/playbooks/ironic_network.yml @@ -3,7 +3,6 @@ hosts: "{{ cifmw_target_hook_host | default('localhost') }}" gather_facts: false vars: - _namespace: openstack _subnet_range: '172.20.1.0/24' _subnet_gateway: '172.20.1.1' _subnet_nameserver: '192.168.122.80' @@ -23,7 +22,7 @@ - name: Create baremetal network ansible.builtin.shell: | set -xe -o pipefail - oc project {{ _namespace }} + oc project {{ cifmw_openstack_namespace }} oc rsh openstackclient \ openstack network create provisioning \ --share \ @@ -52,7 +51,7 @@ - name: Create router for IPv6 provisioning network ansible.builtin.shell: | set -xe -o pipefail - oc project {{ _namespace }} + oc project {{ cifmw_openstack_namespace }} oc rsh openstackclient \ openstack router create provisioning oc rsh openstackclient \ diff --git a/hooks/playbooks/ironic_network_agent_cleanup.yml b/hooks/playbooks/ironic_network_agent_cleanup.yml index 1470b86791..5bdf890582 100644 --- a/hooks/playbooks/ironic_network_agent_cleanup.yml +++ b/hooks/playbooks/ironic_network_agent_cleanup.yml @@ -2,8 +2,6 @@ - name: Delete neutron network agents for Baremetal Nodes hosts: "{{ cifmw_target_hook_host | default('localhost') }}" gather_facts: false - vars: - _namespace: openstack environment: KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}" PATH: "{{ cifmw_path }}" @@ -11,7 +9,7 @@ - name: Delete baremetal network agents ansible.builtin.shell: | set -xe -o pipefail - oc project {{ _namespace }} + oc project {{ cifmw_openstack_namespace }} echo "Discovering baremetal network agents..." diff --git a/hooks/playbooks/run_tofu.yml b/hooks/playbooks/run_tofu.yml index e0b5a78a87..84349a8d30 100644 --- a/hooks/playbooks/run_tofu.yml +++ b/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/" diff --git a/hooks/playbooks/validate_podified_deployment.yml b/hooks/playbooks/validate_podified_deployment.yml index c38f08d69d..7de942c39e 100644 --- a/hooks/playbooks/validate_podified_deployment.yml +++ b/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; diff --git a/playbooks/06-deploy-architecture.yml b/playbooks/06-deploy-architecture.yml index 408e7acc9c..38e2907b8b 100644 --- a/playbooks/06-deploy-architecture.yml +++ b/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 diff --git a/roles/ci_dcn_site/tasks/add_node.yml b/roles/ci_dcn_site/tasks/add_node.yml index 8442e4d8b6..95ba6d29cb 100644 --- a/roles/ci_dcn_site/tasks/add_node.yml +++ b/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 diff --git a/roles/ci_dcn_site/tasks/az.yml b/roles/ci_dcn_site/tasks/az.yml index 94a85b46e9..0909f1dcc5 100644 --- a/roles/ci_dcn_site/tasks/az.yml +++ b/roles/ci_dcn_site/tasks/az.yml @@ -19,7 +19,7 @@ ignore_errors: true kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack aggregate show {{ _az }} -c hosts -f value @@ -36,7 +36,7 @@ - az_hosts.rc == 1 kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack aggregate create {{ _az }} --zone {{ _az }} @@ -49,7 +49,7 @@ - item.key not in az_hosts_list kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack aggregate add host {{ _az }} {{ item.key }}.ctlplane.example.com diff --git a/roles/ci_dcn_site/tasks/deploy_site.yml b/roles/ci_dcn_site/tasks/deploy_site.yml index e4bcd93c09..bd23aa4ca2 100644 --- a/roles/ci_dcn_site/tasks/deploy_site.yml +++ b/roles/ci_dcn_site/tasks/deploy_site.yml @@ -26,7 +26,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 diff --git a/roles/ci_dcn_site/tasks/remove_node.yml b/roles/ci_dcn_site/tasks/remove_node.yml index 06ccb5778e..0cc43f9e42 100644 --- a/roles/ci_dcn_site/tasks/remove_node.yml +++ b/roles/ci_dcn_site/tasks/remove_node.yml @@ -41,7 +41,7 @@ register: removed_compute kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- sh -c "openstack compute service list -c Host -c Zone -f value | grep {{ _node_to_remove}} | awk '{print $1}'" @@ -54,7 +54,7 @@ register: compute_az kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- sh -c "openstack compute service list -c Host -c Zone -f value | grep {{ _removed_compute }} | awk '{print $2}'" @@ -67,7 +67,7 @@ register: osp_instances kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack server list --availability-zone {{ _compute_az }} --host {{ _removed_compute }} --all-projects -f value -c ID @@ -75,7 +75,7 @@ - name: Clean the running instances from the node up kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack server delete --force {{ item }} @@ -84,7 +84,7 @@ - name: Delete the compute nodes from the aggregate kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack aggregate remove host {{ _compute_az }} {{ _removed_compute }} @@ -92,7 +92,7 @@ - name: Disable the compute service on scale-downed compute nodes kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack compute service set {{ _removed_compute }} nova-compute --disable @@ -117,7 +117,7 @@ register: cell_uuid kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: nova-cell0-conductor-0 command: >- sh -c "nova-manage cell_v2 list_hosts | grep {{ _removed_compute }} | awk '{print $4}'" @@ -125,7 +125,7 @@ - name: Remove the compute hosts from the cell 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 delete_host --cell_uuid {{ cell_uuid.stdout }} --host {{ _removed_compute }} @@ -162,7 +162,7 @@ - name: Delete the network agents on scale-downed compute nodes kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- sh -c "openstack network agent list --host {{ _removed_compute }} -c ID -f value | xargs openstack network agent delete" @@ -173,7 +173,7 @@ api_version: dataplane.openstack.org/v1beta1 kind: OpenStackDataPlaneNodeSet name: "{{ az_to_group_map[_compute_az] }}-edpm" - namespace: "openstack" + namespace: "{{ cifmw_openstack_namespace }}" patch: - op: "remove" path: "/spec/nodes/edpm-{{ _node_to_remove }}" @@ -189,7 +189,7 @@ kubernetes.core.k8s: api_key: "{{ _auth_results.openshift_auth.api_key }}" state: present - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" src: "{{ ci_dcn_site_arch_path }}/dataplane_remove_node_deploy.yaml" - name: Wait for the node to be removed from the OpenStackDataPlaneNodeSet CR @@ -197,7 +197,7 @@ api_version: openstack.org/v1beta1 kind: OpenStackDataPlaneNodeSet name: "{{ az_to_group_map[_compute_az] }}-edpm" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" register: nodeset_status until: (_node_to_remove not in (nodeset_status.resources[0].spec.nodes | default({})).keys()) retries: 30 diff --git a/roles/ci_dcn_site/tasks/scaledown_site.yml b/roles/ci_dcn_site/tasks/scaledown_site.yml index 5665a058d0..1ee17f8a55 100644 --- a/roles/ci_dcn_site/tasks/scaledown_site.yml +++ b/roles/ci_dcn_site/tasks/scaledown_site.yml @@ -19,7 +19,7 @@ ignore_errors: true kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack aggregate show {{ _az_to_scaledown }} -c hosts -f value @@ -28,7 +28,7 @@ register: az_compute_hosts kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- sh -c "openstack compute service list -c Host -c Zone -f value | grep {{ _az_to_scaledown }} | awk '{print $1}'" @@ -46,7 +46,7 @@ register: osp_instances kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack server list --availability-zone {{ _az_to_scaledown }} --all-projects -f value -c ID @@ -54,7 +54,7 @@ - name: Clean the running instances from the AZ up before deleting the hosts kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack server delete --force {{ item }} @@ -64,7 +64,7 @@ loop: "{{ az_hosts_list }}" kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack aggregate remove host {{ _az_to_scaledown }} {{ item }} @@ -73,7 +73,7 @@ - name: Delete the host aggregate kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack aggregate delete {{ _az_to_scaledown }} @@ -83,7 +83,7 @@ loop: "{{ az_compute_hosts.stdout_lines }}" kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- openstack compute service set {{ item }} nova-compute --disable @@ -125,7 +125,7 @@ register: cell_uuid kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: nova-cell0-conductor-0 command: >- sh -c "nova-manage cell_v2 list_hosts | grep {{ az_compute_hosts.stdout_lines[0] }} | awk '{print $4}'" @@ -133,7 +133,7 @@ - name: Remove the compute hosts from the cell 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 delete_host --cell_uuid {{ cell_uuid.stdout }} --host {{ item }} @@ -177,13 +177,13 @@ az1: cell2 az2: cell3 ansible.builtin.shell: | - oc delete -n openstack rabbitmqclusters rabbitmq-{{ az_to_cell_map[_az_to_scaledown] }} - oc delete -n openstack galera openstack-{{ az_to_cell_map[_az_to_scaledown] }} + oc delete -n {{ cifmw_openstack_namespace }} rabbitmqclusters rabbitmq-{{ az_to_cell_map[_az_to_scaledown] }} + oc delete -n {{ cifmw_openstack_namespace }} galera openstack-{{ az_to_cell_map[_az_to_scaledown] }} - name: Get list of pods in the openstack namespace kubernetes.core.k8s_info: kind: Pod - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" api_key: "{{ _auth_results.openshift_auth.api_key }}" register: pod_list @@ -197,7 +197,7 @@ - name: Delete the cinder-volume service kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: "{{ cinder_prefix }}-scheduler-0" command: >- cinder-manage service remove cinder-volume {{ cinder_prefix }}-volume-{{ _az_to_scaledown }}-0@ceph @@ -208,7 +208,7 @@ api_key: "{{ _auth_results.openshift_auth.api_key }}" kind: Secret name: ceph-conf-files - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" - name: Create temporary directory for ceph conf files ansible.builtin.file: @@ -230,7 +230,7 @@ api_key: "{{ _auth_results.openshift_auth.api_key }}" kind: Secret name: "{{ item }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" state: absent loop: - "ceph-conf-files-{{ _az_to_scaledown }}" @@ -292,7 +292,7 @@ - name: Delete the network agents on scale-downed compute nodes kubernetes.core.k8s_exec: api_key: "{{ _auth_results.openshift_auth.api_key }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" pod: openstackclient command: >- sh -c "openstack network agent list --host {{ item }} -c ID -f value | xargs openstack network agent delete" @@ -305,7 +305,7 @@ api_version: dataplane.openstack.org/v1beta1 kind: OpenStackDataPlaneNodeSet name: "{{ _group_name }}-edpm" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" - name: Delete OpenStackDataPlaneNodeSet kubernetes.core.k8s: @@ -314,11 +314,11 @@ state: absent kind: OpenStackDataPlaneNodeSet name: "{{ _group_name }}-edpm" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" - name: Delete each Secret which contains TLS certificate for the NodeSet nodes ansible.builtin.command: - cmd: oc -n openstack delete Secret {{ item }} + cmd: oc -n {{ cifmw_openstack_namespace }} delete Secret {{ item }} loop: "{{ osdpns_info.resources[0].status.secretHashes.keys() | select('search', 'cert') | list }}" - name: Delete temporary files with ceph client variables and keys diff --git a/roles/ci_dcn_site/templates/ceph_secrets.yaml.j2 b/roles/ci_dcn_site/templates/ceph_secrets.yaml.j2 index d0bcfe5015..46ca91e1f1 100644 --- a/roles/ci_dcn_site/templates/ceph_secrets.yaml.j2 +++ b/roles/ci_dcn_site/templates/ceph_secrets.yaml.j2 @@ -2,7 +2,7 @@ kind: Secret metadata: name: ceph-conf-files-{{ _az }} - namespace: openstack + namespace: {{ cifmw_openstack_namespace }} type: Opaque apiVersion: v1 data: diff --git a/roles/ci_multus/molecule/default/nads_output.yml b/roles/ci_multus/molecule/default/nads_output.yml index e8dbd98e0f..7c5a0895cb 100644 --- a/roles/ci_multus/molecule/default/nads_output.yml +++ b/roles/ci_multus/molecule/default/nads_output.yml @@ -5,7 +5,7 @@ metadata: labels: osp/net: bridge-to-linux-bridge name: bridge-to-linux-bridge - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" spec: config: | { @@ -27,7 +27,7 @@ metadata: labels: osp/net: default name: default - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" spec: config: | { @@ -49,7 +49,7 @@ metadata: labels: osp/net: patchnetwork name: patchnetwork - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" spec: config: | { diff --git a/roles/cifmw_cephadm/tasks/configure_object.yml b/roles/cifmw_cephadm/tasks/configure_object.yml index 45bf02fecc..d86c03fb29 100644 --- a/roles/cifmw_cephadm/tasks/configure_object.yml +++ b/roles/cifmw_cephadm/tasks/configure_object.yml @@ -21,7 +21,7 @@ when: cifmw_openshift_kubeconfig is defined block: - name: Check if swift is enabled in deployed controlplane - ansible.builtin.shell: "set -o pipefail && oc -n {{ cifmw_cephadm_ns }} get $(oc get oscp -n openstack -o name) -o json| jq .spec.swift.enabled" + ansible.builtin.shell: "set -o pipefail && oc -n {{ cifmw_cephadm_ns }} get $(oc get oscp -n {{ cifmw_openstack_namespace }} -o name) -o json| jq .spec.swift.enabled" register: swift_in_ctlplane # checking swift_endpoints_count will avoid unnecessary errors during ceph deployment re-run diff --git a/roles/cifmw_setup/defaults/main.yml b/roles/cifmw_setup/defaults/main.yml index 9f1daf97dc..fbb8f71044 100644 --- a/roles/cifmw_setup/defaults/main.yml +++ b/roles/cifmw_setup/defaults/main.yml @@ -1,2 +1,2 @@ --- -openstack_namespace: openstack +cifmw_openstack_namespace: openstack diff --git a/roles/cifmw_setup/tasks/deploy_architecture.yml b/roles/cifmw_setup/tasks/deploy_architecture.yml index 7bce8976f3..3a11b4dbd6 100644 --- a/roles/cifmw_setup/tasks/deploy_architecture.yml +++ b/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 diff --git a/roles/cleanup_openstack/tasks/main.yaml b/roles/cleanup_openstack/tasks/main.yaml index 9e85d61d13..3378e34a15 100644 --- a/roles/cleanup_openstack/tasks/main.yaml +++ b/roles/cleanup_openstack/tasks/main.yaml @@ -56,7 +56,7 @@ kubeconfig: "{{ cifmw_openshift_kubeconfig }}" api_key: "{{ cifmw_openshift_token | default(omit) }}" context: "{{ cifmw_openshift_context | default(omit) }}" - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" kind: RabbitmqCluster name: rabbitmq-cell1 patch: diff --git a/roles/federation/tasks/hook_multirealm_controlplane_config.yml b/roles/federation/tasks/hook_multirealm_controlplane_config.yml index 5e5ca60e7a..eb2421dd3f 100644 --- a/roles/federation/tasks/hook_multirealm_controlplane_config.yml +++ b/roles/federation/tasks/hook_multirealm_controlplane_config.yml @@ -153,6 +153,6 @@ type: Opaque metadata: name: federation-realm-data - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" stringData: federation-config.json: "{{ federation_config_json_string }}" diff --git a/roles/install_openstack_ca/molecule/default/files/minimal_openstack_controlplane.yml b/roles/install_openstack_ca/molecule/default/files/minimal_openstack_controlplane.yml index 0033e1c3cb..c7be49af1a 100644 --- a/roles/install_openstack_ca/molecule/default/files/minimal_openstack_controlplane.yml +++ b/roles/install_openstack_ca/molecule/default/files/minimal_openstack_controlplane.yml @@ -2,7 +2,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: name: openstack-galera - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" spec: barbican: enabled: false diff --git a/roles/install_openstack_ca/tasks/main.yml b/roles/install_openstack_ca/tasks/main.yml index 1dbaf5b6be..6523b994b7 100644 --- a/roles/install_openstack_ca/tasks/main.yml +++ b/roles/install_openstack_ca/tasks/main.yml @@ -23,7 +23,7 @@ KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}" PATH: "{{ cifmw_path }}" ansible.builtin.command: - cmd: 'oc get secret combined-ca-bundle -n openstack -o "jsonpath={.data.tls-ca-bundle\.pem}"' + cmd: 'oc get secret combined-ca-bundle -n {{ cifmw_openstack_namespace }} -o "jsonpath={.data.tls-ca-bundle\.pem}"' retries: 10 no_log: true delay: 3 diff --git a/roles/manage_secrets/molecule/osp_secrets/converge.yml b/roles/manage_secrets/molecule/osp_secrets/converge.yml index 50c5239fdf..ffab4354bb 100644 --- a/roles/manage_secrets/molecule/osp_secrets/converge.yml +++ b/roles/manage_secrets/molecule/osp_secrets/converge.yml @@ -22,7 +22,7 @@ cifmw_openshift_login_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" cifmw_manage_secrets_ospsecrets_list: - name: secret1 - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" data: foo: "{{ 'bar' | ansible.builtin.b64encode }}" bar: "{{ 'foo' | ansible.builtin.b64encode }}" @@ -30,7 +30,7 @@ type: very-secret newlabel: new-value - name: secret2 - namespace: openstack + namespace: "{{ cifmw_openstack_namespace }}" data: foobar: "{{ 'barfoo' | ansible.builtin.b64encode }}" label: diff --git a/roles/os_must_gather/defaults/main.yml b/roles/os_must_gather/defaults/main.yml index 458c1c08a9..96b54f5745 100644 --- a/roles/os_must_gather/defaults/main.yml +++ b/roles/os_must_gather/defaults/main.yml @@ -27,7 +27,7 @@ cifmw_os_must_gather_timeout: "30m" cifmw_os_must_gather_additional_namespaces: "kuttl,openshift-storage,openshift-marketplace,openshift-operators,sushy-emulator,tobiko" cifmw_os_must_gather_namespaces: - openstack-operators - - openstack + - "{{ cifmw_openstack_namespace }}" - baremetal-operator-system - openshift-machine-api - cert-manager diff --git a/roles/run_hook/tasks/playbook.yml b/roles/run_hook/tasks/playbook.yml index 5f6e79afd8..faaafbb78f 100644 --- a/roles/run_hook/tasks/playbook.yml +++ b/roles/run_hook/tasks/playbook.yml @@ -19,11 +19,6 @@ cifmw_install_yamls_defaults['OPERATOR_NAMESPACE'] | default('openstack-operators') }} - _namespace: >- - {{ - cifmw_install_yamls_defaults['NAMESPACE'] | - default('openstack') - }} ansible.builtin.set_fact: cifmw_basedir: "{{ _bdir }}" hook_name: "{{ _hook_name }}" @@ -32,7 +27,7 @@ {{ _bdir }}/logs/{{ step }}_{{ _hook_name }}.log extra_vars: >- -e operator_namespace={{ _operator_namespace }} - -e namespace={{ _namespace}} + -e namespace={{ cifmw_openstack_namespace }} {%- if hook.extra_vars is defined and hook.extra_vars|length > 0 -%} {% for key,value in hook.extra_vars.items() -%} {%- if key == 'file' %} diff --git a/roles/shiftstack/molecule/default/cleanup.yml b/roles/shiftstack/molecule/default/cleanup.yml index 27d3f74744..cf339403a4 100644 --- a/roles/shiftstack/molecule/default/cleanup.yml +++ b/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 }}" diff --git a/roles/shiftstack/molecule/default/prepare.yml b/roles/shiftstack/molecule/default/prepare.yml index 889aa9f6f5..f2bdc984e2 100644 --- a/roles/shiftstack/molecule/default/prepare.yml +++ b/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" diff --git a/roles/shiftstack/tasks/cleanup.yml b/roles/shiftstack/tasks/cleanup.yml index 131f2968a8..0184ec45b1 100644 --- a/roles/shiftstack/tasks/cleanup.yml +++ b/roles/shiftstack/tasks/cleanup.yml @@ -24,7 +24,7 @@ kubeconfig: "{{ cifmw_openshift_kubeconfig }}" api_version: v1 kind: Secret - namespace: openstack + namespace: "{{ cifmw_shiftstack_client_pod_namespace }}" name: "{{ cifmw_shiftstack_client_incluster_secret_name }}" proxy: "{{ cifmw_shiftstack_proxy | default(omit) }}" diff --git a/roles/shiftstack/templates/shiftstackclient_incluster_kubeconfig_secret.yml.j2 b/roles/shiftstack/templates/shiftstackclient_incluster_kubeconfig_secret.yml.j2 index 9e4e2b83fa..c9ce454079 100644 --- a/roles/shiftstack/templates/shiftstackclient_incluster_kubeconfig_secret.yml.j2 +++ b/roles/shiftstack/templates/shiftstackclient_incluster_kubeconfig_secret.yml.j2 @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: "{{ cifmw_shiftstack_client_incluster_secret_name }}" - namespace: openstack + namespace: "{{ cifmw_shiftstack_client_pod_namespace }}" type: Opaque data: kubeconfig: {{ incluster_kubeconfig_base64 }} diff --git a/roles/shiftstack/templates/shiftstackclient_pvc.yml.j2 b/roles/shiftstack/templates/shiftstackclient_pvc.yml.j2 index b6d9b175a6..dfd85bb0d8 100644 --- a/roles/shiftstack/templates/shiftstackclient_pvc.yml.j2 +++ b/roles/shiftstack/templates/shiftstackclient_pvc.yml.j2 @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: {{ cifmw_shiftstack_client_pod_name }}-pvc - namespace: openstack + namespace: {{ cifmw_shiftstack_client_pod_namespace }} spec: storageClassName: {{ cifmw_shiftstack_sc }} accessModes: diff --git a/roles/tempest/tasks/create-clouds-file.yml b/roles/tempest/tasks/create-clouds-file.yml index 16da82bb00..1d18ed8040 100644 --- a/roles/tempest/tasks/create-clouds-file.yml +++ b/roles/tempest/tasks/create-clouds-file.yml @@ -4,7 +4,7 @@ KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}" PATH: "{{ cifmw_path }}" ansible.builtin.command: - cmd: oc get keystoneapi keystone -n openstack -o json + cmd: 'oc get keystoneapi keystone -n {{ cifmw_openstack_namespace }} -o json' - name: Set keystone vars vars: @@ -20,7 +20,7 @@ KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}" PATH: "{{ cifmw_path }}" ansible.builtin.command: - cmd: 'oc get secret {{ keystone_secret_name }} -n openstack -o json' + cmd: 'oc get secret {{ keystone_secret_name }} -n {{ cifmw_openstack_namespace }} -o json' - name: Get password data vars: diff --git a/roles/test_operator/defaults/main.yml b/roles/test_operator/defaults/main.yml index 3498dcecd5..5ceef73688 100644 --- a/roles/test_operator/defaults/main.yml +++ b/roles/test_operator/defaults/main.yml @@ -187,7 +187,7 @@ cifmw_test_operator_tobiko_num_processes: null cifmw_test_operator_tobiko_advanced_image_url: "https://github.com/openstack-k8s-operators/openstack-k8s-operators-ci/releases/download/v1.0.0/tobiko-custom-v1.0.0.qcow2" cifmw_test_operator_tobiko_override_conf: {} cifmw_test_operator_tobiko_kubeconfig_secret: tobiko-secret -cifmw_test_operator_tobiko_openstack_cmd: 'oc -n openstack exec openstackclient -- openstack' +cifmw_test_operator_tobiko_openstack_cmd: 'oc -n {{ cifmw_openstack_namespace }} exec openstackclient -- openstack' cifmw_test_operator_tobiko_cleanup: false cifmw_test_operator_tobiko_ssh_keytype: "{{ cifmw_ssh_keytype | default('ecdsa') }}" cifmw_test_operator_tobiko_ssh_keysize: "{{ cifmw_ssh_keysize | default(521) }}" diff --git a/roles/update/tasks/collect_openstackclient_config.yml b/roles/update/tasks/collect_openstackclient_config.yml index 84466b7f0d..e0cf41dca5 100644 --- a/roles/update/tasks/collect_openstackclient_config.yml +++ b/roles/update/tasks/collect_openstackclient_config.yml @@ -2,7 +2,7 @@ - name: Collect file from openstackclient container kubernetes.core.k8s_exec: kubeconfig: "{{ cifmw_openshift_kubeconfig }}" - namespace: "openstack" + namespace: "{{ cifmw_openstack_namespace }}" api_key: "{{ cifmw_openshift_token | default(omit) }}" context: "{{ cifmw_openshift_context | default(omit) }}" pod: "openstackclient" diff --git a/roles/update/tasks/create_local_openstackclient.yml b/roles/update/tasks/create_local_openstackclient.yml index 2d8b20999f..78e79fb01a 100644 --- a/roles/update/tasks/create_local_openstackclient.yml +++ b/roles/update/tasks/create_local_openstackclient.yml @@ -2,7 +2,7 @@ - name: Retrieve the openstackclient Pod kubernetes.core.k8s_info: kubeconfig: "{{ cifmw_openshift_kubeconfig }}" - namespace: "openstack" + namespace: "{{ cifmw_openstack_namespace }}" api_key: "{{ cifmw_openshift_token | default(omit) }}" context: "{{ cifmw_openshift_context | default(omit) }}" kind: "Pod" diff --git a/scenarios/centos-9/edpm_ci.yml b/scenarios/centos-9/edpm_ci.yml index 2ea5df6ffd..07501a52e2 100644 --- a/scenarios/centos-9/edpm_ci.yml +++ b/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'] }}"