From ad6effc40d91aa157bec9a5c74ef31fb4cee427f Mon Sep 17 00:00:00 2001
From: Martin Schuppert <mschuppert@redhat.com>
Date: Wed, 26 Jun 2019 14:57:48 +0200
Subject: [PATCH] Add /run/libvirt to nova_migration_target container

[1] removed the bind mount from /run inside the nova_migration_target
container. But the nova-migration-wrapper inside the container needs
access to the libvirt socket [2].

This adds the bind mount of /run/libvirt to the nova_migration_target
container to fix live migration issues.

[1] https://review.opendev.org/#/c/662109/
[2] https://github.com/rdo-packages/nova-distgit/blob/rpm-master/nova-migration-wrapper#L31

Change-Id: I7e236b838328a7a140a0aba0745bd8ac1db00015
Closes-Bug: #1834330
(cherry picked from commit 537822d47c455cb9e4184744a91d083f2c89609c)
(cherry picked from commit 1425671a384f1634a8057c5ef6fbbe954f1ba4e0)
(cherry picked from commit 95347b3aa94bb4324d8e4aa2c1554fbce6f9beaa)
---
 docker/services/nova-migration-target.yaml               | 1 +
 ...migration_target_libvirt_socket-585fa579e5b2704d.yaml | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 releasenotes/notes/nova_migration_target_libvirt_socket-585fa579e5b2704d.yaml

diff --git a/docker/services/nova-migration-target.yaml b/docker/services/nova-migration-target.yaml
index 65e8d67214..78dfbb7c08 100644
--- a/docker/services/nova-migration-target.yaml
+++ b/docker/services/nova-migration-target.yaml
@@ -149,6 +149,7 @@ outputs:
                   - /var/lib/kolla/config_files/nova-migration-target.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
                   - /etc/ssh/:/host-ssh/:ro
+                  - /run/libvirt:/run/libvirt
                   - /var/lib/nova:/var/lib/nova:shared
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
diff --git a/releasenotes/notes/nova_migration_target_libvirt_socket-585fa579e5b2704d.yaml b/releasenotes/notes/nova_migration_target_libvirt_socket-585fa579e5b2704d.yaml
new file mode 100644
index 0000000000..88adc7b9f0
--- /dev/null
+++ b/releasenotes/notes/nova_migration_target_libvirt_socket-585fa579e5b2704d.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    https://review.opendev.org/#/c/662109/ removed the bind mount from /run
+    inside the nova_migration_target container. But the nova-migration-wrapper
+    inside the container needs access to the libvirt socket -
+    https://github.com/rdo-packages/nova-distgit/blob/rpm-master/nova-migration-wrapper#L31 .
+    This adds the bind mount of /run/libvirt to the nova_migration_target
+    container to fix live migration issues.