Merge pull request #411 from stackhpc/upstream/zed-2023-08-14

Synchronise zed with upstream
stackhpc · Aug 14, 2023 · 720cba3 · 720cba3
2 parents f1fddb2 + 9f8c454
commit 720cba3
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 0 deletions.
diff --git a/ansible/roles/loadbalancer/defaults/main.yml b/ansible/roles/loadbalancer/defaults/main.yml
@@ -146,3 +146,7 @@ haproxy_host_ipv4_tcp_retries2: "KOLLA_UNSET"
 haproxy_socket_level_admin: "no"
 
 kolla_externally_managed_cert: False
+
+# Allow to disable keepalived tracking script (e.g. for single node environments
+# where this proves problematic in some cases)
+keepalived_track_script_enabled: True
diff --git a/ansible/roles/loadbalancer/tasks/config.yml b/ansible/roles/loadbalancer/tasks/config.yml
@@ -98,6 +98,7 @@
   become: true
   with_dict: "{{ loadbalancer_services }}"
   when:
+    - keepalived_track_script_enabled | bool
     - inventory_hostname in groups[service.group]
     - inventory_hostname in groups[item.value.group]
     - item.key != 'keepalived'

diff --git a/ansible/roles/loadbalancer/templates/keepalived/keepalived.conf.j2 b/ansible/roles/loadbalancer/templates/keepalived/keepalived.conf.j2
@@ -1,9 +1,11 @@
+{% if keepalived_track_script_enabled | bool %}
 vrrp_script check_alive {
     script "/check_alive.sh"
     interval 2
     fall 2
     rise 10
 }
+{% endif %}
 
 vrrp_instance kolla_internal_vip_{{ keepalived_virtual_router_id }} {
     state BACKUP
@@ -40,7 +42,9 @@ vrrp_instance kolla_internal_vip_{{ keepalived_virtual_router_id }} {
         auth_type PASS
         auth_pass {{ keepalived_password }}
     }
+{% if keepalived_track_script_enabled | bool %}
     track_script {
         check_alive
     }
+{% endif %}
 }
diff --git a/ansible/roles/nova-cell/templates/nova.conf.d/libvirt.conf.j2 b/ansible/roles/nova-cell/templates/nova.conf.d/libvirt.conf.j2
@@ -27,3 +27,5 @@ cpu_mode = {{ nova_libvirt_cpu_mode }}
 {% if enable_multipathd | bool %}
 volume_use_multipath = True
 {% endif %}
+[workarounds]
+skip_cpu_compare_on_dest = True
diff --git a/ansible/roles/opensearch/handlers/main.yml b/ansible/roles/opensearch/handlers/main.yml
@@ -29,5 +29,6 @@
     image: "{{ service.image }}"
     name: "{{ service.container_name }}"
     volumes: "{{ service.volumes }}"
+    healthcheck: "{{ service.healthcheck | default(omit) }}"
   when:
     - kolla_action != "config"
diff --git a/releasenotes/notes/fix-os-dashboards-health-check-bf56027f8c3369ea.yaml b/releasenotes/notes/fix-os-dashboards-health-check-bf56027f8c3369ea.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where a Docker health check wasn't configured for
+    the OpenSearch Dashboards container. See bug `2028362
+    <https://bugs.launchpad.net/kolla-ansible/+bug/2028362>`__.
diff --git a/releasenotes/notes/keepalived_track_script-edfebb520f006647.yaml b/releasenotes/notes/keepalived_track_script-edfebb520f006647.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    Fixes an issue where keepalived track script fails on single controller
+    environment and keepalived VIP goes into BACKUP state.
+    ``keepalived_track_script_enabled`` variable has been introduced (default:
+    true), which can be used to disable track scripts in keepalived
+    configuration.
+    `LP#2025219 <https://launchpad.net/bugs/2025219>`__
diff --git a/releasenotes/notes/skip-cpu-compare-on-dest-927004854f41bc32.yaml b/releasenotes/notes/skip-cpu-compare-on-dest-927004854f41bc32.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    Changes default value of nova libvirt driver setting
+    ``skip_cpu_compare_on_dest`` to true. With the libvirt driver, during
+    live migration, skip comparing guest CPU with the destination host.
+    When using QEMU >= 2.9 and libvirt >= 4.4.0, libvirt will do the correct
+    thing with respect to checking CPU compatibility on the destination host
+    during live migration.
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
@@ -198,3 +198,7 @@ enable_opensearch: "yes"
 enable_keystone: "yes"
 enable_venus: "yes"
 {% endif %}
+
+{% if groups['all'] | length == 1 %}
+keepalived_track_script_enabled: "no"
+{% endif %}