From fd893918ce1f6fde80211c3566febf6af3b6020b Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Mon, 28 Jun 2021 16:54:12 +0200 Subject: [PATCH] Only reference _bundle manifests in cinder-{backup,volume}-pacemaker-puppet.yaml Let's remove the non used non-_bundle pacemaker manifests. We do not support any HA via non-containerized services at this point in time. And via Id1340c45679d720cdf5ed9b5b15347d73cffc445 we're actually removing them from puppet-tripleo. Change-Id: I60b92234a8b41b1843e702ff238dd8b6e94dd6e2 --- deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 2 +- deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 00652077ba..ec43bf74bd 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -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: diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 0e5d5f2e53..bff391e202 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -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: