openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Emilien Macchi 2016-06-17 12:11:36 -04:00
parent c4f27255c5
commit a9c3b92680
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet/manifests/overcloud_compute.pp
View File

@ -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';