aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-06-09 09:51:58 -0400
committerDan Prince <dprince@redhat.com>2016-06-16 15:04:25 -0400
commit9e502fc07d4520c873cde64dfd01a901cd271274 (patch)
treedb69bbabda31cc25f9e27fffd83be184c6187baf /puppet/manifests/overcloud_controller_pacemaker.pp
parent7b22f2d8305931b8f556f8a6a2d049a9b9ac90a9 (diff)
Composable neutron nuage plugin
Partially-implements: blueprint composable-services-within-roles Depends-On: Ia4a297008b259a8e238bd1ad511e82f4e5ab6d63 Change-Id: I80ac1a5393a17d4cf997cd3ef060574455d1b5ec
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp3
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 1327111..27834cf 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.plugins.nuage.plugin.NuagePlugin' {
- include ::neutron::plugins::nuage
- }
if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
include ::neutron::plugins::opencontrail
}