X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_compute.pp;h=ab7f846fb82802b0d878d0815ddd771e1385dee6;hb=60b83ae436cbe61514405602cd9eeb5da5ed56e1;hp=1a86b38ac461754ee71f34de0095d2abd6035f81;hpb=b510cabb86d9e887e1f849fe56b98624d578f55b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 1a86b38a..ab7f846f 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -17,27 +17,6 @@ include ::tripleo::packages
 include ::tripleo::firewall
 
 if hiera('step') >= 4 {
-
-  # When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique
-  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',
-  }->
-
-  file { '/etc/iscsi/.initiator_reset':
-    ensure => present,
-  }
-
-  nova_config {
-    'DEFAULT/my_ip': value => $ipaddress;
-    'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
-  }
-
-  include ::ceilometer
-  include ::ceilometer::config
-  include ::ceilometer::agent::compute
-  include ::ceilometer::agent::auth
-
   hiera_include('compute_classes')
 }