From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 12 Jul 2016 18:08:02 +0000 (+0000)
Subject: Merge "profile/nova/compute: add iscsi bits"
X-Git-Tag: opnfv-6.0.0~689
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3e13b4648c620d281d6c01606fc5b3652bfe6680;p=apex-puppet-tripleo.git

Merge "profile/nova/compute: add iscsi bits"
---

3e13b4648c620d281d6c01606fc5b3652bfe6680
diff --cc manifests/profile/base/nova/compute.pp
index 16b61df,4297031..c734906
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@@ -41,19 -36,17 +41,30 @@@ class tripleo::profile::base::nova::com
  
      # 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
 +  if $cinder_nfs_backend {
 +    ensure_packages('nfs-utils', { ensure => present })
 +    Package['nfs-utils'] -> Service['nova-compute']
 +    if str2bool($::selinux) {
 +      selboolean { 'virt_use_nfs':
 +        value      => on,
 +        persistent => true,
 +      }
 +      Selboolean['virt_use_nfs'] -> Package['nfs-utils']
 +    }
 +  }
 +
  }