Merge "Only reference _bundle manifests in cinder-{backup,volume}-pacemaker-puppet.yaml"
This commit is contained in:
commit
d8e47c9036
|
@ -146,7 +146,7 @@ outputs:
|
|||
list_join:
|
||||
- "\n"
|
||||
- - {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}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/cinder_backup.json:
|
||||
|
|
|
@ -134,7 +134,7 @@ outputs:
|
|||
list_join:
|
||||
- "\n"
|
||||
- - "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]
|
||||
config_image: {get_param: ContainerCinderConfigImage}
|
||||
kolla_config:
|
||||
|
|
Loading…
Reference in New Issue