diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-23 13:51:51 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-23 13:51:51 +0000 |
commit | 8716d9f769dd17ef17fef7f0fdefaf0df6a7fe24 (patch) | |
tree | 9e05fcef2a739808ce63e8469ff7724a78a84184 | |
parent | b758dff5758a84b8a72766dd2591477f68b23c50 (diff) | |
parent | 555eb6d964d1d07342b1f06a8e8542860cd9beaa (diff) |
Merge "Keep existing data for containerized Libvirt"
-rw-r--r-- | docker/services/nova-compute.yaml | 7 | ||||
-rw-r--r-- | docker/services/nova-libvirt.yaml | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 7fc00b47..0afd3e70 100644 --- 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 85fabe5a..a0437162 100644 --- 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 |