Merge pull request #343 from stackhpc/upstream/2023.1-2024-11-11

Synchronise 2023.1 with upstream
stackhpc · Nov 12, 2024 · 4a4f954 · 4a4f954
2 parents 0dcfe9a + 0fff987
commit 4a4f954
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla
@@ -231,6 +231,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
@@ -516,6 +518,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

diff --git a/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py b/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py
@@ -12,8 +12,8 @@
 
 
 def _is_apt():
-    info = distro.linux_distribution()
-    return info[0].startswith('Ubuntu')
+    info = distro.id()
+    return info == 'ubuntu'
 
 
 def _is_dnf():

diff --git a/releasenotes/notes/build-proxysql-image-ec09332ef0b7dae0.yaml b/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``.