From b510cabb86d9e887e1f849fe56b98624d578f55b Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 6 Jul 2016 14:23:54 -0400 Subject: Composable OpenContrail compute plugin Adds a new neutron compute plugin used to help configure opencontrail for use on compute nodes. Change-Id: I67a649445d5f1cb21ab9483bae7f5f4c2c657142 --- puppet/manifests/overcloud_compute.pp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'puppet/manifests') diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 5d315a72..1a86b38a 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -33,16 +33,6 @@ if hiera('step') >= 4 { '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 -- cgit 1.2.3-korg