From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 17 Jun 2016 16:10:57 +0000 (-0400)
Subject: profile/nova/compute: add iscsi bits
X-Git-Tag: opnfv-6.0.0~689^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d8602d28c76ca63af3bbe358047b3d3d8624b356;p=apex-puppet-tripleo.git

profile/nova/compute: add iscsi bits

Add iscsi bits allowing live migration.

Change-Id: I495a7af4220f0b35e9fd0a6cfc146610d8f46d10
---

diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index 579b474..4297031 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -36,6 +36,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,
+    }
   }
 
 }