Adds os_cloud_name variable for development_environment role

As part of [1] this adds a new os_cloud_name var for the development_environment role to be used with the prelaunch vm test instance creation. This retains current behaviour OS_CLOUD=standalone. Needed by [2]. https://issues.redhat.com/browse/OSPRH-5754 [1] https://issues.redhat.com/browse/OSPRH-3038 [2] https://review.rdoproject.org/r/c/rdo-jobs/+/52452
openstack-k8s-operators · Apr 17, 2024 · 52bd789 · 52bd789
1 parent 6209f6b
commit 52bd789
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml
@@ -64,7 +64,7 @@ default_timesync_ntp_servers:
 edpm_node_hostname: standalone.localdomain
 edpm_user: root
 edpm_nodes:
-  standalone:
+  "{{ edpm_node_hostname | default('standalone') }}":
     hostName: "{{ edpm_node_hostname }}"
     ansible:
       ansibleHost: "{{ edpm_node_ip }}"

diff --git a/tests/roles/development_environment/defaults/main.yaml b/tests/roles/development_environment/defaults/main.yaml
@@ -2,3 +2,4 @@ prelaunch_test_instance: true
 prelaunch_test_instance_script: pre_launch.bash
 edpm_privatekey_path: ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa
 run_pre_adoption_validation: true
+os_cloud_name: standalone
diff --git a/tests/roles/development_environment/tasks/main.yaml b/tests/roles/development_environment/tasks/main.yaml
@@ -6,5 +6,5 @@
     EDPM_PRIVATEKEY_PATH: "{{ edpm_privatekey_path }}"
   ansible.builtin.shell:
     cmd: |
-      alias openstack="ssh -i {{ edpm_privatekey_path }} root@{{ edpm_node_ip }} OS_CLOUD=standalone openstack"
+      alias openstack="ssh -i {{ edpm_privatekey_path }} root@{{ standalone_ip | default(edpm_node_ip) }} OS_CLOUD={{ os_cloud_name }} openstack"
       {{ lookup('ansible.builtin.file', prelaunch_test_instance_script) }}