Merge branch 'main' into barbican_secret_test

openstack-k8s-operators · Jun 26, 2024 · 00871fa · 00871fa
2 parents 245bcf6 + f7e3da5
commit 00871fa
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc
@@ -348,7 +348,6 @@ endif::[]
         edpm_ovn_bridge_mappings: <bridge_mappings>
         edpm_ovn_bridge: br-int
         edpm_ovn_encap_type: geneve
-        ovn_match_northd_version: false
         ovn_monitor_all: true
         edpm_ovn_remote_probe_interval: 60000
         edpm_ovn_ofctrl_wait_before_clear: 8000

diff --git a/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc
@@ -161,7 +161,6 @@ endif::[]
         edpm_ovn_bridge_mappings: <bridge_mappings>
         edpm_ovn_bridge: br-int
         edpm_ovn_encap_type: geneve
-        ovn_match_northd_version: false
         ovn_monitor_all: true
         edpm_ovn_remote_probe_interval: 60000
         edpm_ovn_ofctrl_wait_before_clear: 8000

diff --git a/docs_user/modules/proc_pulling-configuration-from-a-tripleo-deployment.adoc b/docs_user/modules/proc_pulling-configuration-from-a-tripleo-deployment.adoc
@@ -77,7 +77,6 @@ services:
       ovn-bridge-mappings: edpm_ovn_bridge_mappings
       ovn-bridge: edpm_ovn_bridge
       ovn-encap-type: edpm_ovn_encap_type
-      ovn-match-northd-version: ovn_match_northd_version
       ovn-monitor-all: ovn_monitor_all
       ovn-remote-probe-interval: edpm_ovn_remote_probe_interval
       ovn-ofctrl-wait-before-clear: edpm_ovn_ofctrl_wait_before_clear
@@ -105,7 +104,6 @@ The `service_command`  provides the required information. It could be a simple c
             ovn-bridge: edpm_ovn_bridge
             ovn-bridge-mappings: edpm_ovn_bridge_mappings
             ovn-encap-type: edpm_ovn_encap_type
-            ovn-match-northd-version: ovn_match_northd_version
             ovn-monitor-all: ovn_monitor_all
             ovn-ofctrl-wait-before-clear: edpm_ovn_ofctrl_wait_before_clear
             ovn-remote-probe-interval: edpm_ovn_remote_probe_interval

diff --git a/docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc b/docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc
@@ -7,11 +7,12 @@
 * Define the following shell variables. The values that are used are examples. Replace these example values with values that are correct for your environment:
 +
 ----
-CONTROLLER_SSH="ssh -F ~/director_standalone/vagrant_ssh_config vagrant@standalone"
 ifeval::["{build}" != "downstream"]
+CONTROLLER1_SSH="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa [email protected]"
 MARIADB_IMAGE=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified
 endif::[]
 ifeval::["{build}" == "downstream"]
+CONTROLLER1_SSH="ssh -i *<path to SSH key>* root@*<node IP>*"
 MARIADB_IMAGE=registry.redhat.io/rhosp-dev-preview/openstack-mariadb-rhel9:18.0
 endif::[]
 SOURCE_MARIADB_IP=172.17.0.2
@@ -62,7 +63,7 @@ echo "$PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES"
 . Get the list of mapped the {compute_service} cells:
 +
 ----
-export PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS=$($CONTROLLER_SSH sudo podman exec -it nova_api nova-manage cell_v2 list_cells)
+export PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS=$($CONTROLLER1_SSH sudo podman exec -it nova_api nova-manage cell_v2 list_cells)
 echo "$PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS"
 ----
 +
@@ -84,7 +85,7 @@ PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS="$(oc run mariadb-client ${MARI
 PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES="$(oc run mariadb-client ${MARIADB_CLIENT_ANNOTATIONS} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
     mysql -rsh $SOURCE_MARIADB_IP -uroot -p$SOURCE_DB_ROOT_PASSWORD nova_api -e \
     "select host from nova.services where services.binary='nova-compute';")"
-PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS="$($CONTROLLER_SSH sudo podman exec -it nova_api nova-manage cell_v2 list_cells)"
+PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS="$($CONTROLLER1_SSH sudo podman exec -it nova_api nova-manage cell_v2 list_cells)"
 EOF
 chmod 0600 ~/.source_cloud_exported_variables
 ----

diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml
@@ -151,3 +151,4 @@ skip_patching_ansibleee_csv: false
 # OS Diff automation steps
 os_diff_dir: tmp/os-diff
 os_diff_data_dir: tmp/os-diff
+prelaunch_test_instance: true
diff --git a/tests/roles/dataplane_adoption/tasks/main.yaml b/tests/roles/dataplane_adoption/tasks/main.yaml
@@ -221,7 +221,6 @@
             edpm_ovn_bridge_mappings: ["datacentre:{{ neutron_physical_bridge_name }}"]
             edpm_ovn_bridge: br-int
             edpm_ovn_encap_type: geneve
-            ovn_match_northd_version: false
             ovn_monitor_all: true
             edpm_ovn_remote_probe_interval: 60000
             edpm_ovn_ofctrl_wait_before_clear: 8000

diff --git a/tests/roles/dataplane_adoption/tasks/neutron_verify.yaml b/tests/roles/dataplane_adoption/tasks/neutron_verify.yaml
@@ -49,5 +49,6 @@
     success_msg: "neutron-dhcp-agent is ALIVE after adoption"
 
 - name: verify connectivity to the existing test VM instance using Floating IP
+  when: prelaunch_test_instance|bool
   ansible.builtin.shell: |
       ping -c4 {{ lookup('env', 'FIP') | default('192.168.122.20', True) }}
diff --git a/tests/roles/get_services_configuration/tasks/main.yaml b/tests/roles/get_services_configuration/tasks/main.yaml
@@ -3,7 +3,7 @@
   no_log: "{{ use_no_log }}"
   ansible.builtin.set_fact:
     pull_openstack_configuration_ssh_shell_vars: |
-      CONTROLLER_SSH="{{ controller1_ssh }}"
+      CONTROLLER1_SSH="{{ controller1_ssh }}"
 
 - name: get src database service environment variables
   ansible.builtin.include_role:
@@ -64,7 +64,7 @@
       ansible.builtin.shell: |
         {{ shell_header }}
         {{ pull_openstack_configuration_ssh_shell_vars }}
-        export PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS=$($CONTROLLER_SSH sudo podman exec -it nova_api nova-manage cell_v2 list_cells)
+        export PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS=$($CONTROLLER1_SSH sudo podman exec -it nova_api nova-manage cell_v2 list_cells)
         echo "$PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS"
       register: _nova_cell_mappings_check
 
@@ -95,6 +95,6 @@
     PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES="$(oc run mariadb-client ${MARIADB_CLIENT_ANNOTATIONS} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
         mysql -rsh $SOURCE_MARIADB_IP -uroot -p$SOURCE_DB_ROOT_PASSWORD nova_api -e \
         "select host from nova.services where services.binary='nova-compute';")"
-    PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS="$($CONTROLLER_SSH sudo podman exec -it nova_api nova-manage cell_v2 list_cells)"
+    PULL_OPENSTACK_CONFIGURATION_NOVAMANAGE_CELL_MAPPINGS="$($CONTROLLER1_SSH sudo podman exec -it nova_api nova-manage cell_v2 list_cells)"
     EOF
     chmod 0600 ~/.source_cloud_exported_variables