From a9c3b92680190abaad071ef0816ccc91f4e0cc60 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 17 Jun 2016 12:11:36 -0400 Subject: compute: moving out iscsi bits, now in puppet-tripleo Move bits from THT to puppet-tripleo. Implements: blueprint composable-services-within-roles Change-Id: I9866506b120afdf35891a396ea1bbe1c0f592b3f Depends-On: I495a7af4220f0b35e9fd0a6cfc146610d8f46d10 --- puppet/manifests/overcloud_compute.pp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index b25d62f8..41f432c1 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -18,16 +18,6 @@ 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'; -- cgit 1.2.3-korg