openstack
/
puppet-tripleo
Code Issues Proposed changes

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
This commit is contained in:
Emilien Macchi 2018-01-11 13:48:06 -08:00
parent 181cd834cd
commit 19ed96ef06
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/pacemaker/cinder/backup_bundle.pp
View File

@ -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',

2
manifests/profile/pacemaker/cinder/volume_bundle.pp
View File

@ -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',