openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Keep existing data for containerized Libvirt"

Browse Source
This commit is contained in:
Jenkins 2017-03-23 13:51:51 +00:00 committed by Gerrit Code Review
commit 8716d9f769
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/services/nova-compute.yaml
View File

@ -83,6 +83,11 @@ outputs:
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro
- /run:/run - /run:/run
- /var/lib/nova:/var/lib/nova - /var/lib/nova:/var/lib/nova
- libvirtd:/var/lib/libvirt - /var/lib/libvirt:/var/lib/libvirt
environment: environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
- name: create /var/lib/libvirt
file:
path: /var/lib/libvirt
state: directory

12
docker/services/nova-libvirt.yaml
View File

@ -88,7 +88,15 @@ outputs:
- /var/lib/nova:/var/lib/nova - /var/lib/nova:/var/lib/nova
# Needed to use host's virtlogd # Needed to use host's virtlogd
- /var/run/libvirt:/var/run/libvirt - /var/run/libvirt:/var/run/libvirt
- libvirtd:/var/lib/libvirt - /var/lib/libvirt:/var/lib/libvirt
- nova_libvirt_qemu:/etc/libvirt/qemu - /etc/libvirt/qemu:/etc/libvirt/qemu
environment: environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - 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