aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-06-10 16:30:00 -0400
committerEmilien Macchi <emilien@redhat.com>2016-06-10 16:30:00 -0400
commite1238aa903f088f49699cd4c1e10a55655e08ab5 (patch)
treeb4100488c47f2eed310ff8bf6ba51f25fe33a565 /puppet
parent184dba99c1a11c0a5b82bb10b8fec301d1eb1437 (diff)
neutron: stop include ::neutron & ::neutron::config
They are already included in puppet-tripleo. Note: in the case of Midonet pluging, keep including the class because we set service_plugins parameter. This patch adds a TODO so we'll add it in Hiera when doing the composable plugin in THT. Change-Id: Ic9303df2d8622d4d4fc4ce21888f00653cf32207
Diffstat (limited to 'puppet')
-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 872e7c88..ba0ad5c9 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -207,18 +207,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 ee513a0d..81cdb102 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -433,17 +433,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
}