aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-06-17 12:11:36 -0400
committerEmilien Macchi <emilien@redhat.com>2016-07-12 12:27:43 +0000
commita9c3b92680190abaad071ef0816ccc91f4e0cc60 (patch)
treec62252285ff4266df3e5542aa878bc481d0fc243 /puppet/manifests
parentc4f27255c50a8afc737346db549b701515494f79 (diff)
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
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_compute.pp10
1 files changed, 0 insertions, 10 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index b25d62f..41f432c 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';