From 328f62ddd763c625c8a711e47b4ca1e7b7ae12c5 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Fri, 21 Jul 2023 16:45:37 +0100
Subject: [PATCH 1/2] Fix OpenSearch Dashboards health check

The OpenSearch Dashboards container does not have a health
check defined when created. This causes the container to always
restart when reconfigured, even if no change has been made.

Change-Id: I0b437a77aeb61bc5ae9238f900a1fa00cbc34e18
Partial-Bug: #2028362
(cherry picked from commit bacd6c7f4ff6788feb75a6abc4339e29684195ab)
---
 ansible/roles/opensearch/handlers/main.yml                  | 1 +
 .../fix-os-dashboards-health-check-bf56027f8c3369ea.yaml    | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 releasenotes/notes/fix-os-dashboards-health-check-bf56027f8c3369ea.yaml

diff --git a/ansible/roles/opensearch/handlers/main.yml b/ansible/roles/opensearch/handlers/main.yml
index 3c147ad893..9d4e0b3527 100644
--- 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
new file mode 100644
index 0000000000..fa59680234
--- /dev/null
+++ 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>`__.

From ffdea86eedc9316120c315c94b16d70a4a63fe7d Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Mon, 10 Jul 2023 12:25:59 +0200
Subject: [PATCH 2/2] Enable nova libvirt driver skip_cpu_compare_on_dest
 workaround

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.[1]

[1] https://opendev.org/openstack/nova/commit/267a40663cd8d0b94bbc5ebda4ece55a45753b64

Change-Id: I947c94b59368c7a2740583bf57e407296473d75e
(cherry picked from commit bcf002509db0d68b8e15a80b3267c2f6965a6ced)
---
 .../nova-cell/templates/nova.conf.d/libvirt.conf.j2      | 2 ++
 .../notes/skip-cpu-compare-on-dest-927004854f41bc32.yaml | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 releasenotes/notes/skip-cpu-compare-on-dest-927004854f41bc32.yaml

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
index 69d8f9363b..3f599c051a 100644
--- 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/releasenotes/notes/skip-cpu-compare-on-dest-927004854f41bc32.yaml b/releasenotes/notes/skip-cpu-compare-on-dest-927004854f41bc32.yaml
new file mode 100644
index 0000000000..10dd8980f8
--- /dev/null
+++ 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.