From 37bb689a0fe37e9365373dbd47291a4323d36bd7 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 10 Jun 2016 15:42:22 -0400 Subject: Composable opencontrail plugin Partially-implements: blueprint composable-services-within-roles Change-Id: I17ac5dc2a6fb82a82d1db039e61fc8e87ba88333 --- puppet/manifests/overcloud_controller_pacemaker.pp | 3 --- 1 file changed, 3 deletions(-) (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp') diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 27834cf8..13331c9e 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -400,9 +400,6 @@ MYSQL_HOST=localhost\n", } - if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' { - include ::neutron::plugins::opencontrail - } if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { class {'::neutron::plugins::midonet': midonet_api_ip => hiera('public_virtual_ip'), -- cgit 1.2.3-korg