Merge "cinder/pacemaker: resolve puppet resource duplications"

This commit is contained in:
Zuul 2018-01-12 15:46:53 +00:00 committed by Gerrit Code Review
commit 614fb7414a
2 changed files with 2 additions and 2 deletions

View File

@ -134,7 +134,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
'target-dir' => '/var/log/cinder', 'target-dir' => '/var/log/cinder',
'options' => 'rw', 'options' => 'rw',
}, },
'ceph-cfg-dir' => { 'cinder-backup-ceph-cfg-dir' => {
'source-dir' => '/etc/ceph', 'source-dir' => '/etc/ceph',
'target-dir' => '/var/lib/kolla/config_files/src-ceph', 'target-dir' => '/var/lib/kolla/config_files/src-ceph',
'options' => 'ro', 'options' => 'ro',

View File

@ -134,7 +134,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
'target-dir' => '/var/log/cinder', 'target-dir' => '/var/log/cinder',
'options' => 'rw', 'options' => 'rw',
}, },
'ceph-cfg-dir' => { 'cinder-volume-ceph-cfg-dir' => {
'source-dir' => '/etc/ceph', 'source-dir' => '/etc/ceph',
'target-dir' => '/var/lib/kolla/config_files/src-ceph/', 'target-dir' => '/var/lib/kolla/config_files/src-ceph/',
'options' => 'ro', 'options' => 'ro',