Merge branch 'openstack-k8s-operators:main' into update-crds-test-operator

Author: kstrenkova

ansible.cfg

@@ -16,4 +16,4 @@ inventory = inventory.yml
 pipelining = True
 any_errors_fatal = True
 [ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=60s
+ssh_args = -o ControlMaster=auto -o ControlPersist=300

clean_openstack_deployment.yaml

@@ -0,0 +1,10 @@
+- name: Clean OpenStack deployment
+  hosts: "{{ target_host | default('localhost') }}"
+  gather_facts: false
+  tasks:
+    - name: Clean up OpenStack operators
+      vars:
+        cifmw_kustomize_deploy_keep_generated_crs: false
+      ansible.builtin.include_role:
+        name: kustomize_deploy
+        tasks_from: cleanup

playbooks/06-deploy-architecture.yml

@@ -226,9 +226,12 @@
       tags:
         - update_containers
         - edpm_bootstrap
+      when: cifmw_ci_gen_kustomize_values_deployment_version is not defined
 
     - name: Update containers in deployed OSP operators using set_openstack_containers role
-      when: cifmw_set_openstack_containers | default(false) | bool
+      when:
+        - cifmw_set_openstack_containers | default(false) | bool
+        - cifmw_ci_gen_kustomize_values_deployment_version is not defined
       ansible.builtin.include_role:
         name: set_openstack_containers
       tags:

playbooks/update.yml

@@ -39,6 +39,7 @@
         cifmw_set_openstack_containers_openstack_final_env: "operator_env_after_update.txt"
       ansible.builtin.include_role:
         name: set_openstack_containers
+      when: cifmw_ci_gen_kustomize_values_deployment_version is not defined
 
 - name: Sync repos for controller to compute
   hosts: computes