diff options
| author |   Oliver Walsh <owalsh@redhat.com> | 2017-07-10 15:48:22 +0100 |
|---|---|---|
| committer | Oliver Walsh <owalsh@redhat.com> | 2017-07-11 20:38:35 +0100 |
| commit | fb10b8ec5be95e761d541162150ca3eec7b58a61 (patch) | |
| tree | 9ddb91c92b6bae8a1d1d3a68fccf4523a0c5a485 /manifests/profile/base/nova | |
| parent | ec9aea34c7f520b1a2a9138574bf5ba4f0a6b4c9 (diff) | |
Refactor iscsi initiator-name reset into separate profile
This currently assumes nova-compute and iscsid run in the same context which
isn't true for a containerized deployment
Change-Id: I91f1ce7625c351745dbadd84b565d55598ea5b59
Diffstat (limited to 'manifests/profile/base/nova')
| -rw-r--r-- | manifests/profile/base/nova/compute.pp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp index bd50204..3eae880 100644 --- a/manifests/profile/base/nova/compute.pp +++ b/manifests/profile/base/nova/compute.pp @@ -45,19 +45,6 @@ class tripleo::profile::base::nova::compute ( # deploy bits to connect nova compute to neutron include ::nova::network::neutron - - # When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique - # https://bugzilla.redhat.com/show_bug.cgi?id=1244328 - ensure_resource('package', 'iscsi-initiator-utils', { ensure => 'present' }) - 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', - before => File['/etc/iscsi/.initiator_reset'], - require => Package['iscsi-initiator-utils'], - } - file { '/etc/iscsi/.initiator_reset': - ensure => present, - } } # If NFS is used as a Cinder backend |