summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-11-02 10:11:00 +0100
committerMartin André <m.andre@redhat.com>2017-11-10 07:32:41 +0000
commitf2b1ec7ee9c70563ed682c314910c8fd4c6871aa (patch)
tree6cc883e919f5e9e95bcac739de41fe60ecfc5804
parent9387e08b621c2794a68b62cd8f8cda41489990cb (diff)
Fix bind mounts for cinder-{backup,volume}
The container now expects to find configuration at these locations. Change-Id: Iea84a291414e515d8c72a60646188e5b37354a38 Related-Bug: #1729430 (cherry picked from commit 9df7f1c85df56fa9de54bd45f53d1c16ea23c731)
-rw-r--r--manifests/profile/pacemaker/cinder/backup_bundle.pp8
-rw-r--r--manifests/profile/pacemaker/cinder/volume_bundle.pp8
2 files changed, 8 insertions, 8 deletions
diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp
index 9c897af..51793ca 100644
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp
@@ -120,9 +120,9 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
'options' => 'ro',
},
'cinder-backup-iscsi' => {
- 'source-dir' => '/etc/iscsi',
- 'target-dir' => '/etc/iscsi',
- 'options' => 'rw',
+ 'source-dir' => '/var/lib/config-data/puppet-generated/iscsid/',
+ 'target-dir' => '/var/lib/kolla/config_files/src-iscsid',
+ 'options' => 'ro',
},
'cinder-backup-var-lib-cinder' => {
'source-dir' => '/var/lib/cinder',
@@ -136,7 +136,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
},
'ceph-cfg-dir' => {
'source-dir' => '/etc/ceph',
- 'target-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 2b0411f..392dbfb 100644
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp
@@ -120,9 +120,9 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
'options' => 'ro',
},
'cinder-volume-iscsi' => {
- 'source-dir' => '/etc/iscsi',
- 'target-dir' => '/etc/iscsi',
- 'options' => 'rw',
+ 'source-dir' => '/var/lib/config-data/puppet-generated/iscsid/',
+ 'target-dir' => '/var/lib/kolla/config_files/src-iscsid',
+ 'options' => 'ro',
},
'cinder-volume-var-lib-cinder' => {
'source-dir' => '/var/lib/cinder',
@@ -136,7 +136,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
},
'ceph-cfg-dir' => {
'source-dir' => '/etc/ceph',
- 'target-dir' => '/etc/ceph',
+ 'target-dir' => '/var/lib/kolla/config_files/src-ceph/',
'options' => 'ro',
},
},