aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-21 07:51:08 +0000
committerGerrit Code Review <review@openstack.org>2017-07-21 07:51:08 +0000
commit7a6e479f27bbdcd29918669a3793886115f9b009 (patch)
tree82ec36d3d9a93d735d6f6c85a084ffa1d4092bf1 /docker/services
parent782f68c8fd6df1c3ee00fd19d5a8ff9447689d72 (diff)
parent391a38e91c7be4e4bf718bb8ebf03cf44ebd67c8 (diff)
Merge "Add nova::compute::rbd setting into nova-libvirt profile"
Diffstat (limited to 'docker/services')
-rw-r--r--docker/services/nova-libvirt.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index a5527747..36bdc7f3 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -96,7 +96,7 @@ outputs:
get_attr: [NovaLibvirtBase, role_data, step_config]
puppet_config:
config_volume: nova_libvirt
- puppet_tags: nova_config
+ puppet_tags: nova_config,file,exec
step_config: *step_config
config_image: {get_param: DockerNovaLibvirtConfigImage}
kolla_config:
@@ -134,6 +134,7 @@ outputs:
- /run:/run
- /sys/fs/cgroup:/sys/fs/cgroup
- /var/lib/nova:/var/lib/nova
+ - /etc/libvirt/secrets:/etc/libvirt/secrets
# Needed to use host's virtlogd
- /var/run/libvirt:/var/run/libvirt
- /var/lib/libvirt:/var/lib/libvirt
@@ -148,6 +149,7 @@ outputs:
path: "{{ item }}"
state: directory
with_items:
+ - /etc/libvirt/secrets
- /etc/libvirt/qemu
- /var/lib/libvirt
- /var/log/containers/nova