update vars

openstack-k8s-operators · Nov 4, 2024 · ff1e42b · ff1e42b
1 parent 02c0507
commit ff1e42b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml
@@ -272,3 +272,16 @@ dataplane_cr: |
           ovn_monitor_all: true
           edpm_ovn_remote_probe_interval: 60000
           edpm_ovn_ofctrl_wait_before_clear: 8000
+
+dpa_dir: "../.."
+dpa_tests_dir: "{{ dpa_dir }}/tests"
+
+# ospdo env:
+# Whether source env is OSPD Director Operator
+# i.e. https://github.com/openstack-k8s-operators/osp-director-operator
+ospdo_src: false
+# rhoso namespace
+rhoso_namespace: "openstack"
+# director operator namespace
+org_namespace: "ospdo_openstack"
+# adoption repo default location
diff --git a/tests/roles/dataplane_adoption/tasks/main.yaml b/tests/roles/dataplane_adoption/tasks/main.yaml
@@ -13,7 +13,7 @@
     {{ shell_header }}
     {{ oc_header }}
     {{ oc_login_command }}
-    oc patch -n {{ rhoso_namespace|default('openstack') }} openstackversion openstack \
+    oc patch -n {{ rhoso_namespace }} openstackversion openstack \
       --type='json' -p='[{
       "op":"replace", "path":"/spec/customContainerImages/ansibleeeImage",
       "value": "{{ ansibleee_runner_img | default('quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest')}}"}]'
@@ -23,7 +23,7 @@
   ansible.builtin.shell: |
     {{ shell_header }}
     {{ oc_header }}
-    oc project {{ rhoso_namespace|default('openstack') }}
+    oc project {{ rhoso_namespace }}
 
 - name: Include RHEV vars
   ansible.builtin.include_vars:
@@ -84,7 +84,7 @@
     cd "$(mktemp -d)"
     ssh-keygen -f ./id -t ecdsa-sha2-nistp521 -N ''
     oc get secret nova-migration-ssh-key || oc create secret generic nova-migration-ssh-key \
-    -n  {{ rhoso_namespace|default('openstack') }} \
+    -n  {{ rhoso_namespace }} \
     --from-file=ssh-privatekey=id \
     --from-file=ssh-publickey=id.pub \
     --type kubernetes.io/ssh-auth
@@ -104,7 +104,7 @@
     kind: ConfigMap
     metadata:
       name: nova-extra-config
-      namespace:  {{ rhoso_namespace|default('openstack') }}
+      namespace:  {{ rhoso_namespace }}
     data:
       19-nova-compute-cell1-workarounds.conf: |
         [workarounds]
@@ -125,7 +125,7 @@
     kind: ConfigMap
     metadata:
       name: nova-extra-config
-      namespace: {{ rhoso_namespace|default('openstack') }}
+      namespace: {{ rhoso_namespace }}
     data:
       19-nova-compute-cell1-workarounds.conf: |
         [workarounds]