From 19ed96ef06b1b6e4ee6e82d9938dbc8fdc4e839c Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 11 Jan 2018 13:48:06 -0800
Subject: [PATCH] cinder/pacemaker: resolve puppet resource duplications

Some pacemaker bundle resources were in conflict and that made Puppet
catalog failing. This patch makes sure that resources are now unique.

Change-Id: I940cec6d670df39ac6e2a3559a028acbeee99331
Closes-Bug: #1742795
---
 manifests/profile/pacemaker/cinder/backup_bundle.pp | 2 +-
 manifests/profile/pacemaker/cinder/volume_bundle.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp
index dcfcc0a79..720f912af 100644
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp
@@ -134,7 +134,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
             'target-dir' => '/var/log/cinder',
             'options'    => 'rw',
           },
-          'ceph-cfg-dir'                 => {
+          'cinder-backup-ceph-cfg-dir'   => {
             'source-dir' => '/etc/ceph',
             'target-dir' => '/var/lib/kolla/config_files/src-ceph',
             'options'    => 'ro',
diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp
index 80e64928c..3009d574d 100644
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp
@@ -134,7 +134,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
             'target-dir' => '/var/log/cinder',
             'options'    => 'rw',
           },
-          'ceph-cfg-dir'                 => {
+          'cinder-volume-ceph-cfg-dir'   => {
             'source-dir' => '/etc/ceph',
             'target-dir' => '/var/lib/kolla/config_files/src-ceph/',
             'options'    => 'ro',