Keep existing data for containerized Libvirt

Use mounts instead of docker volumes to preserve existing data when
moving from baremetal to containerized Libvirt.

Change-Id: I2215d451a4ef4023741f0750ac1b45a94652026a

diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 7fc00b4..0afd3e7 100644 (file)
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -83,6 +83,11 @@ outputs:
               - /lib/modules:/lib/modules:ro
               - /run:/run
               - /var/lib/nova:/var/lib/nova
-              - libvirtd:/var/lib/libvirt
+              - /var/lib/libvirt:/var/lib/libvirt
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create /var/lib/libvirt
+          file:
+            path: /var/lib/libvirt
+            state: directory

diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index e25b201..e8de990 100644 (file)
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -88,7 +88,15 @@ outputs:
               - /var/lib/nova:/var/lib/nova
               # Needed to use host's virtlogd
               - /var/run/libvirt:/var/run/libvirt
-              - libvirtd:/var/lib/libvirt
-              - nova_libvirt_qemu:/etc/libvirt/qemu
+              - /var/lib/libvirt:/var/lib/libvirt
+              - /etc/libvirt/qemu:/etc/libvirt/qemu
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create libvirt persistent data directories
+          file:
+            path: "{{ item }}"
+            state: directory
+          with_items:
+            - /etc/libvirt/qemu
+            - /var/lib/libvirt