diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-02-10 12:39:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-02-10 12:39:36 +0000 |
| commit | 93c392fa204c3e9f528fe78c1bdeb74806e0d18e (patch) | |
| tree | 4439a6f1361d2901a6ccd7026bea818c1ec540f1 /puppet/manifests | |
| parent | 3bd5d13c535e99519f114f6daa1537c760f1ad8d (diff) | |
| parent | 4b4415620f9089deeabf18662a45dd305732f08d (diff) | |
Merge "Makes the iSCSI initiator name unique for compute nodes"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 593cc500..4b0f98e4 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -37,6 +37,16 @@ exec { 'libvirt-default-net-destroy': before => Service['libvirt'], } +# When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique +exec { 'reset-iscsi-initiator-name': + command => '/bin/echo InitiatorName=$(/usr/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi', + onlyif => '/usr/bin/test ! -f /etc/iscsi/.initiator_reset', +}-> + +file { '/etc/iscsi/.initiator_reset': + ensure => present, +} + include ::nova include ::nova::config include ::nova::compute |