Merge pull request #669 from stackhpc/upstream/master-2025-01-27

Synchronise master with upstream

Author: priteau

ansible/roles/grafana/tasks/config.yml

@@ -100,7 +100,9 @@
   file:
     state: absent
     path: "{{ node_config_directory }}/grafana/dashboards/"
-  when: service | service_enabled_and_mapped_to_host
+  when:
+    - not ansible_check_mode
+    - service | service_enabled_and_mapped_to_host
 
 - name: Copying over custom dashboards
   vars:

ansible/roles/grafana/tasks/post_config.yml

@@ -12,6 +12,7 @@
   retries: 30
   delay: 2
   run_once: true
+  when: not ansible_check_mode
 
 - name: Remove old grafana docker volume
   become: true

ansible/roles/magnum/tasks/register.yml

@@ -51,3 +51,4 @@
       cacert: "{{ openstack_cacert }}"
       region_name: "{{ openstack_region_name }}"
   run_once: True
+  when: not ansible_check_mode

ansible/roles/opensearch/tasks/post-config.yml

@@ -13,6 +13,7 @@
   retries: 30
   delay: 2
   run_once: true
+  when: not ansible_check_mode
 
 - name: Check if a log retention policy exists
   become: true
@@ -46,7 +47,9 @@
   delegate_to: "{{ groups['opensearch'][0] }}"
   run_once: true
   changed_when: opensearch_retention_policy_create.status == 201
-  when: opensearch_retention_policy_check.status == 404
+  when:
+    - not ansible_check_mode
+    - opensearch_retention_policy_check.status == 404
 
 - name: Apply retention policy to existing indices
   become: true
@@ -66,4 +69,6 @@
   delegate_to: "{{ groups['opensearch'][0] }}"
   run_once: true
   changed_when: opensearch_retention_policy_create.status == 201
-  when: opensearch_retention_policy_check.status == 404
+  when:
+    - not ansible_check_mode
+    - opensearch_retention_policy_check.status == 404

tests/templates/globals-default.j2

@@ -45,7 +45,7 @@ mariadb_wsrep_extra_provider_options:
   - "evs.inactive_timeout=PT30S"
   - "evs.keepalive_period=PT3S"
 
-mariadb_monitor_connect_timeout: "6000"
+mariadb_monitor_connect_timeout: "60000"
 
 nova_compute_virt_type: "{{ virt_type }}"
 

tests/test-zun.sh

@@ -15,8 +15,8 @@ function test_zun_logged {
     openstack appcontainer service list
     openstack appcontainer host list
     openstack subnet set --no-dhcp demo-subnet
-    sudo ${container_engine} pull alpine
-    sudo ${container_engine} save alpine | openstack image create alpine --public --container-format docker --disk-format raw
+    sudo ${container_engine} pull quay.io/openstack.kolla/alpine
+    sudo ${container_engine} save quay.io/openstack.kolla/alpine | openstack image create alpine --public --container-format docker --disk-format raw
     openstack appcontainer run --net network=demo-net --name test alpine sleep 1000
     attempt=1
     while [[ $(openstack appcontainer show test -f value -c status) != "Running" ]]; do

zuul.d/base.yaml

@@ -208,7 +208,7 @@
     parent: kolla-ansible-scenario-base
     voting: true
     files: !inherit
-      - ^ansible/roles/mariadb/
+      - ^ansible/roles/(loadbalancer|mariadb|proxysql-config)/
       - ^tests/test-mariadb.sh
     vars:
       scenario: mariadb