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 "Adds stop and disable for libvirtd on upgrade to containers"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
cinder-volume.yaml
diff --git
a/docker/services/cinder-volume.yaml
b/docker/services/cinder-volume.yaml
index
ce81fbf
..
2ead0d5
100644
(file)
--- a/
docker/services/cinder-volume.yaml
+++ b/
docker/services/cinder-volume.yaml
@@
-51,6
+51,9
@@
resources:
ContainersCommon:
type: ./containers-common.yaml
ContainersCommon:
type: ./containers-common.yaml
+ MySQLClient:
+ type: ../../puppet/services/database/mysql-client.yaml
+
CinderBase:
type: ../../puppet/services/cinder-volume.yaml
properties:
CinderBase:
type: ../../puppet/services/cinder-volume.yaml
properties:
@@
-75,6
+78,7
@@
outputs:
- "\n"
- - "include ::tripleo::profile::base::lvm"
- get_attr: [CinderBase, role_data, step_config]
- "\n"
- - "include ::tripleo::profile::base::lvm"
- get_attr: [CinderBase, role_data, step_config]
+ - get_attr: [MySQLClient, role_data, step_config]
service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config: