openstack
/
puppet-tripleo
Code Issues Proposed changes

Bind-mount iscsid IQN by its real host path 

Containerized or running on baremetal services
on a node must use the same iSCSI Qualified Name (IQN).
However, overcloud nodes must have a unique IQN.

Tht's puppet config bind mounts the real hosts' /etc/iscsid
directory so that puppet ensures the IQN is unique and
is reset once, and only once.

Switch the host path bind mount for cinder bundles to catch up
that configuration path as well.

Related-bug: #1735425

Change-Id: I7e9f0641164691682516ac3e72e2145c7d112409
Co-authored-by: Alan Bishop <abishop@redhat.com>
Co-authored-by: Martin André <m.andre@redhat.com>
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 5fb0826ee2)
This commit is contained in:
Bogdan Dobrelya 2017-12-07 14:36:55 +01:00
parent 6f18d036d2
commit c67619413e
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

@ -120,7 +120,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
'options' => 'ro',
},
'cinder-backup-iscsi' => {
'source-dir' => '/var/lib/config-data/puppet-generated/iscsid/',
'source-dir' => '/etc/iscsi',
'target-dir' => '/var/lib/kolla/config_files/src-iscsid',
'options' => 'ro',
},

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

@ -120,7 +120,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
'options' => 'ro',
},
'cinder-volume-iscsi' => {
'source-dir' => '/var/lib/config-data/puppet-generated/iscsid/',
'source-dir' => '/etc/iscsi',
'target-dir' => '/var/lib/kolla/config_files/src-iscsid',
'options' => 'ro',
},