Merge pull request #338 from stackhpc/upstream/2024.1-2024-11-04

Synchronise 2024.1 with upstream

ansible/inventory/group_vars/all/kolla

@@ -233,6 +233,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_placement | bool }}"
   - regex: ^prometheus
     enabled: "{{ kolla_enable_prometheus | bool }}"
+  - regex: ^proxysql
+    enabled: "{{ kolla_enable_proxysql | bool }}"
   - regex: ^qdrouterd
     enabled: "{{ kolla_enable_qdrouterd | bool }}"
   - regex: ^rabbitmq
@@ -508,6 +510,7 @@ kolla_enable_mariadb: "yes"
 kolla_enable_memcached: "yes"
 kolla_enable_neutron: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_nova: "{{ kolla_enable_openstack_core | bool }}"
+kolla_enable_proxysql: "no"
 kolla_enable_rabbitmq: "yes"
 
 # OpenStack services can be enabled or disabled with these options

playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py

@@ -26,6 +26,12 @@ def _is_dnf_mirror():
     return info == 'centos'
 
 
+def _is_ubuntu_noble():
+    name = distro.name()
+    version = distro.version()
+    return name == 'Ubuntu' and version == 24.04
+
+
 def test_network_ethernet(host):
     interface = host.interface('dummy2')
     assert interface.exists
@@ -197,6 +203,9 @@ def test_ntp_non_default_time_server(host):
     assert "time.cloudflare.com" in chrony_config.content_string
 
 
+# TODO(priteau): Remove once we force time sync
+@pytest.mark.skipif(_is_ubuntu_noble(),
+                    reason="Clock often fails to synchronize on Ubuntu Noble")
 def test_ntp_clock_synchronized(host):
     # Tests that the clock is synchronized
     status_output = host.check_output("timedatectl status")

releasenotes/notes/build-proxysql-image-ec09332ef0b7dae0.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The ``proxysql`` image is now built when ``kolla_enable_proxysql`` is set
+    to ``true``.