diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-12 18:08:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-12 18:08:02 +0000 |
| commit | 3e13b4648c620d281d6c01606fc5b3652bfe6680 (patch) | |
| tree | 0080438b5932c79d8f38b2dbd2b4f03c58187f7a /manifests/profile/base | |
| parent | 1a8b6aaeff4bad560b768575c1568c5dee5f43ac (diff) | |
| parent | d8602d28c76ca63af3bbe358047b3d3d8624b356 (diff) | |
Merge "profile/nova/compute: add iscsi bits"
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/nova/compute.pp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp index 16b61df..c734906 100644 --- a/manifests/profile/base/nova/compute.pp +++ b/manifests/profile/base/nova/compute.pp @@ -41,6 +41,17 @@ 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 + 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'], + } + file { '/etc/iscsi/.initiator_reset': + ensure => present, + } } # If NFS is used as a Cinder backend |