openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Makes the iSCSI initiator name unique for compute nodes"

This commit is contained in:
Jenkins 2016-02-10 12:39:36 +00:00 committed by Gerrit Code Review
parent 3bd5d13c53 4b4415620f
commit 93c392fa20
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet/manifests/overcloud_compute.pp
View File

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