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 "Add support for Dell EMC Unity Cinder backend"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
pacemaker
/
cinder-volume.yaml
diff --git
a/docker/services/pacemaker/cinder-volume.yaml
b/docker/services/pacemaker/cinder-volume.yaml
index
262e999
..
3c1b7a7
100644
(file)
--- a/
docker/services/pacemaker/cinder-volume.yaml
+++ b/
docker/services/pacemaker/cinder-volume.yaml
@@
-48,6
+48,9
@@
parameters:
resources:
resources:
+ MySQLClient:
+ type: ../../../puppet/services/database/mysql-client.yaml
+
CinderBase:
type: ../../../puppet/services/cinder-volume.yaml
properties:
CinderBase:
type: ../../../puppet/services/cinder-volume.yaml
properties:
@@
-76,7
+79,11
@@
outputs:
puppet_config:
config_volume: cinder
puppet_tags: cinder_config,file,concat,file_line
puppet_config:
config_volume: cinder
puppet_tags: cinder_config,file,concat,file_line
- step_config: {get_attr: [CinderBase, role_data, step_config]}
+ step_config:
+ list_join:
+ - "\n"
+ - - {get_attr: [CinderBase, role_data, step_config]}
+ - {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_volume.json:
config_image: {get_param: DockerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_volume.json: