Merge "Fix cinder-backup deployment templates"

changes/34/635134/13
Zuul 4 years ago committed by Gerrit Code Review
commit 4c3b51cbc4
  1. 9
      deployment/cinder/cinder-backup-container-puppet.yaml
  2. 3
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@ -141,13 +141,14 @@ outputs:
config_volume: cinder
puppet_tags: cinder_config,file,concat,file_line
step_config:
str_replace:
template: "include ::tripleo::profile::base::cinder::backup::DRIVER"
params:
DRIVER: {get_param: CinderBackupBackend}
list_join:
- "\n"
- - {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]}
config_image: {get_param: DockerCinderConfigImage}
kolla_config:

@ -138,8 +138,7 @@ outputs:
step_config:
list_join:
- "\n"
- - {get_attr: [CinderBackupBase, role_data, step_config]}
- {get_attr: [MySQLClient, role_data, step_config]}
- - {get_attr: [CinderBackupBase, role_data, puppet_config, step_config]}
- "include ::tripleo::profile::pacemaker::cinder::backup"
config_image: {get_param: DockerCinderConfigImage}
kolla_config:

Loading…
Cancel
Save