Merge "Only reference _bundle manifests in cinder-{backup,volume}-pacemaker-puppet.yaml"

This commit is contained in:
Zuul 2021-08-02 16:29:09 +00:00 committed by Gerrit Code Review
commit d8e47c9036
2 changed files with 2 additions and 2 deletions

View File

@ -146,7 +146,7 @@ outputs:
list_join: list_join:
- "\n" - "\n"
- - {get_attr: [CinderBackupBase, role_data, puppet_config, step_config]} - - {get_attr: [CinderBackupBase, role_data, puppet_config, step_config]}
- "include tripleo::profile::pacemaker::cinder::backup" - "include tripleo::profile::pacemaker::cinder::backup_bundle"
config_image: {get_param: ContainerCinderConfigImage} config_image: {get_param: ContainerCinderConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/cinder_backup.json: /var/lib/kolla/config_files/cinder_backup.json:

View File

@ -134,7 +134,7 @@ outputs:
list_join: list_join:
- "\n" - "\n"
- - "include tripleo::profile::base::lvm" - - "include tripleo::profile::base::lvm"
- - "include tripleo::profile::pacemaker::cinder::volume" - - "include tripleo::profile::pacemaker::cinder::volume_bundle"
- get_attr: [MySQLClient, role_data, step_config] - get_attr: [MySQLClient, role_data, step_config]
config_image: {get_param: ContainerCinderConfigImage} config_image: {get_param: ContainerCinderConfigImage}
kolla_config: kolla_config: