aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--puppet/manifests/overcloud_controller.pp9
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp7
2 files changed, 4 insertions, 12 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 95c933d4..c6a80661 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -199,18 +199,13 @@ if hiera('step') >= 4 {
}
# TODO: find a way to get an empty list from hiera
+ # TODO: when doing the composable midonet plugin, don't forget to
+ # set service_plugins to an empty array in Hiera.
class {'::neutron':
service_plugins => []
}
}
- else {
-
- # ML2 plugin
- include ::neutron
- }
-
- include ::neutron::config
# If the value of core plugin is set to 'nuage' or'opencontrail' or 'plumgrid',
# include nuage or opencontrail or plumgrid core plugins
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 614f23ba..d042bda9 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -412,17 +412,14 @@ MYSQL_HOST=localhost\n",
}
# Configure Neutron
+ # TODO: when doing the composable midonet plugin, don't forget to
+ # set service_plugins to an empty array in Hiera.
class {'::neutron':
service_plugins => []
}
}
- else {
- # Neutron class definitions
- include ::neutron
- }
- include ::neutron::config
if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
include ::neutron::plugins::nuage
}