Merge "Fix cinder-backup deployment templates"
This commit is contained in:
commit
4c3b51cbc4
|
@ -141,13 +141,14 @@ outputs:
|
||||||
config_volume: cinder
|
config_volume: cinder
|
||||||
puppet_tags: cinder_config,file,concat,file_line
|
puppet_tags: cinder_config,file,concat,file_line
|
||||||
step_config:
|
step_config:
|
||||||
str_replace:
|
|
||||||
template: "include ::tripleo::profile::base::cinder::backup::DRIVER"
|
|
||||||
params:
|
|
||||||
DRIVER: {get_param: CinderBackupBackend}
|
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
- - {get_attr: [CinderBase, role_data, step_config]}
|
- - {get_attr: [CinderBase, role_data, step_config]}
|
||||||
|
-
|
||||||
|
str_replace:
|
||||||
|
template: "include ::tripleo::profile::base::cinder::backup::DRIVER"
|
||||||
|
params:
|
||||||
|
DRIVER: {get_param: CinderBackupBackend}
|
||||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||||
config_image: {get_param: DockerCinderConfigImage}
|
config_image: {get_param: DockerCinderConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
|
|
|
@ -138,8 +138,7 @@ outputs:
|
||||||
step_config:
|
step_config:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
- - {get_attr: [CinderBackupBase, role_data, step_config]}
|
- - {get_attr: [CinderBackupBase, role_data, puppet_config, step_config]}
|
||||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
||||||
- "include ::tripleo::profile::pacemaker::cinder::backup"
|
- "include ::tripleo::profile::pacemaker::cinder::backup"
|
||||||
config_image: {get_param: DockerCinderConfigImage}
|
config_image: {get_param: DockerCinderConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
|
|
Loading…
Reference in New Issue