diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-12 18:17:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-12 18:17:08 +0000 |
| commit | ec10f7a71e243e512dcd0cf5b96ca8dec0e4dc54 (patch) | |
| tree | 284eae857721338413849d04902b69e3fac69c2a /puppet | |
| parent | 50eaf849f89030068293bcd500d487b8b26ad30a (diff) | |
| parent | a9c3b92680190abaad071ef0816ccc91f4e0cc60 (diff) | |
Merge "compute: moving out iscsi bits, now in puppet-tripleo"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 1a86b38a..6e446fd8 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'; |