Merge pull request #410 from stackhpc/upstream/yoga-2023-08-14

Synchronise yoga with upstream
stackhpc · Aug 14, 2023 · 0e5908c · 0e5908c
2 parents 0a56762 + cb9dd21
commit 0e5908c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
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/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.