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 "Copy scheduler configuration from service/ironic to services-docker/ironic"
[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
7d7b16e
..
2f3851a
100644
(file)
--- a/
docker/services/nova-libvirt.yaml
+++ b/
docker/services/nova-libvirt.yaml
@@
-14,7
+14,7
@@
parameters:
type: string
EnablePackageInstall:
default: 'false'
type: string
EnablePackageInstall:
default: 'false'
- description: Set to true to enable package installation
+ description: Set to true to enable package installation
at deploy time
type: boolean
ServiceData:
default: {}
type: boolean
ServiceData:
default: {}
@@
-74,6
+74,9
@@
resources:
ContainersCommon:
type: ./containers-common.yaml
ContainersCommon:
type: ./containers-common.yaml
+ MySQLClient:
+ type: ../../puppet/services/database/mysql-client.yaml
+
NovaLibvirtBase:
type: ../../puppet/services/nova-libvirt.yaml
properties:
NovaLibvirtBase:
type: ../../puppet/services/nova-libvirt.yaml
properties:
@@
-93,10
+96,13
@@
outputs:
config_settings:
get_attr: [NovaLibvirtBase, role_data, config_settings]
step_config: &step_config
config_settings:
get_attr: [NovaLibvirtBase, role_data, config_settings]
step_config: &step_config
- get_attr: [NovaLibvirtBase, role_data, step_config]
+ list_join:
+ - "\n"
+ - - {get_attr: [NovaLibvirtBase, role_data, step_config]}
+ - {get_attr: [MySQLClient, role_data, step_config]}
puppet_config:
config_volume: nova_libvirt
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
+117,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
+139,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
+164,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}