From 9e502fc07d4520c873cde64dfd01a901cd271274 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 9 Jun 2016 09:51:58 -0400 Subject: Composable neutron nuage plugin Partially-implements: blueprint composable-services-within-roles Depends-On: Ia4a297008b259a8e238bd1ad511e82f4e5ab6d63 Change-Id: I80ac1a5393a17d4cf997cd3ef060574455d1b5ec --- puppet/manifests/overcloud_controller.pp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'puppet/manifests/overcloud_controller.pp') diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 6084c954..e22bf449 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -202,12 +202,10 @@ if hiera('step') >= 4 { } - # If the value of core plugin is set to 'nuage' or'opencontrail' - # include nuage or opencontrail core plugins + # If the value of core plugin is set to 'opencontrail' + # include opencontrail core plugins # else use the default value of 'ml2' - if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' { - include ::neutron::plugins::nuage - } elsif hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' { + if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' { include ::neutron::plugins::opencontrail } else { -- cgit 1.2.3-korg