WIP

Signed-off-by: Bohdan Dobrelia <[email protected]>
openstack-k8s-operators · Nov 26, 2024 · 0ba8ce7 · 0ba8ce7
1 parent a1207eb
commit 0ba8ce7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 51 deletions.
diff --git a/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml b/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
@@ -1,8 +1,3 @@
-- name: get dst database service environment variables
-  ansible.builtin.include_role:
-    name: mariadb_copy
-    tasks_from: env_vars_dst.yaml
-
 - name: wait for cell1 Nova compute EDPM services version updated
   ansible.builtin.shell: |
     {{ shell_header }}

diff --git a/tests/roles/mariadb_copy/tasks/env_vars_dst.yaml b/tests/roles/mariadb_copy/tasks/env_vars_dst.yaml
diff --git a/tests/roles/mariadb_copy/tasks/env_vars_src.yaml b/tests/roles/mariadb_copy/tasks/env_vars_src.yaml
diff --git a/tests/roles/mariadb_copy/tasks/env_vars_src_ospdo.yaml b/tests/roles/mariadb_copy/tasks/env_vars_src_ospdo.yaml
@@ -23,12 +23,14 @@
         mariadb_copy_shell_vars_src: |
           MARIADB_IMAGE=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified
           STORAGE_CLASS=host-nfs-storageclass
-          SOURCE_MARIADB_IP={{ source_mariadb_ip.stdout }}
-          declare -A SOURCE_GALERA_MEMBERS
-          SOURCE_GALERA_MEMBERS=(
+          declare -A SOURCE_MARIADB_IP
+          SOURCE_MARIADB_IP['default']={{ source_mariadb_ip.stdout }}
+          declare -A SOURCE_GALERA_MEMBERS_DEFAULT
+          SOURCE_GALERA_MEMBERS_DEFAULT=(
           ["standalone.localdomain"]={{ source_mariadb_ip.stdout }}
           )
-          SOURCE_DB_ROOT_PASSWORD={{ source_db_root_pass.stdout }}
+          declare -A SOURCE_DB_ROOT_PASSWORD
+          SOURCE_DB_ROOT_PASSWORD['default']={{ source_db_root_pass.stdout }}
           MARIADB_CLIENT_ANNOTATIONS="-n {{ org_namespace }}"
           CONTROLLER_NODE={{ controller_node.stdout }}