Merge "Fixed libvirt volume path for nova-migration-target-container" into stable/train

deployment/nova/nova-migration-target-container-puppet.yaml

@@ -144,6 +144,21 @@ outputs:
               dest: /etc/ssh/
               owner: "root"
               perm: "0600"
+      host_prep_tasks:
+        # Let's use loop here even for one item, maybe we'll need some more
+        # directories later.
+        - name: Create libvirt persistent data directories
+          file:
+            path: "{{ item.path }}"
+            state: directory
+            setype: "{{ item.setype }}"
+          loop:
+            - { 'path': /var/run/libvirt, 'setype': virt_var_run_t }
+        - name: ensure /var/run/libvirt is present upon reboot
+          copy:
+            dest: /etc/tmpfiles.d/var-run-libvirt.conf
+            content: |
+              d /var/run/libvirt 0755 root root - -
       docker_config:
         step_4:
           nova_migration_target:
@@ -161,7 +176,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/run/libvirt:/var/run/libvirt:shared,z
                   - /var/lib/nova:/var/lib/nova:shared
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS