Merge "Deploy Horizon with composable apache service"

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_compute.pp

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 5d315a7..ab7f846 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -17,37 +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';
-  }
-
-  if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
-
-    include ::contrail::vrouter
-    # NOTE: it's not possible to use this class without a functional
-    # contrail controller up and running
-    #class {'::contrail::vrouter::provision_vrouter':
-    #  require => Class['contrail::vrouter'],
-    #}
-  }
-
-  include ::ceilometer
-  include ::ceilometer::config
-  include ::ceilometer::agent::compute
-  include ::ceilometer::agent::auth
-
   hiera_include('compute_classes')
 }