diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-13 23:53:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-13 23:53:32 +0000 |
| commit | c4262a48c63ea4eed35807b7efcc594a9d550121 (patch) | |
| tree | cfe478509304817425cf959852cef2a14204758a /manifests/profile/base/nova | |
| parent | 1fffae05649a1ea46744a7ac1e2c88edb797e1f1 (diff) | |
| parent | fb10b8ec5be95e761d541162150ca3eec7b58a61 (diff) | |
Merge "Refactor iscsi initiator-name reset into separate profile"
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 |