Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Enable libvirtd_config puppet tag in nova-libvirtd docker service"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-libvirt.yaml
diff --git
a/docker/services/nova-libvirt.yaml
b/docker/services/nova-libvirt.yaml
index
5fc7939
..
973b0eb
100644
(file)
--- 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
get_attr: [NovaLibvirtBase, role_data, step_config]
puppet_config:
config_volume: nova_libvirt
- puppet_tags: nova_config,file,exec
+ puppet_tags:
libvirtd_config,
nova_config,file,exec
step_config: *step_config
config_image: {get_param: DockerNovaLibvirtConfigImage}
kolla_config:
step_config: *step_config
config_image: {get_param: DockerNovaLibvirtConfigImage}
kolla_config:
@@
-111,6
+111,10
@@
outputs:
dest: "/"
merge: true
preserve_properties: true
dest: "/"
merge: true
preserve_properties: true
+ - source: "/var/lib/kolla/config_files/src-ceph/"
+ dest: "/etc/ceph/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/log/nova
owner: nova:nova
permissions:
- path: /var/log/nova
owner: nova:nova
@@
-129,6
+133,7
@@
outputs:
-
- /var/lib/kolla/config_files/nova_libvirt.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
-
- /var/lib/kolla/config_files/nova_libvirt.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/ceph:/var/lib/kolla/config_files/src-ceph:ro
- /lib/modules:/lib/modules:ro
- /dev:/dev
- /run:/run
- /lib/modules:/lib/modules:ro
- /dev:/dev
- /run:/run
@@
-153,6
+158,10
@@
outputs:
- /etc/libvirt/qemu
- /var/lib/libvirt
- /var/log/containers/nova
- /etc/libvirt/qemu
- /var/lib/libvirt
- /var/log/containers/nova
+ - name: ensure ceph configurations exist
+ file:
+ path: /etc/ceph
+ state: directory
- name: set enable_package_install fact
set_fact:
enable_package_install: {get_param: EnablePackageInstall}
- name: set enable_package_install fact
set_fact:
enable_package_install: {get_param: EnablePackageInstall}