aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-05-11 11:34:57 -0400
committerDan Prince <dprince@redhat.com>2016-06-09 10:44:58 -0400
commit08a201e23853455ffce6ff0d6c72163547ae7c06 (patch)
tree347e2e2f675b68163e8683be010d6261fcf0675c /puppet/manifests/overcloud_controller.pp
parentf89de8512b39f3fd4af48c4812eea336ea59f02a (diff)
composable neutron server
Adds new puppet and puppet pacemaker specific services for the Neutron server configuration. Depends-On: I52815f45a04bf3e39940b9cb116261730580a3e2 Partially-implements: blueprint composable-services-within-roles Change-Id: I1680d4b7044f16d672e99ca356d954b6734af287
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp3
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 89569ae5..bd54e2a0 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -87,7 +87,6 @@ if hiera('step') >= 2 {
# Create all the database schemas
include ::nova::db::mysql
include ::nova::db::mysql_api
- include ::neutron::db::mysql
if downcase(hiera('gnocchi_indexer_backend')) == 'mysql' {
include ::gnocchi::db::mysql
}
@@ -221,8 +220,6 @@ if hiera('step') >= 4 {
}
include ::neutron::config
- include ::neutron::server
- include ::neutron::server::notifications
# If the value of core plugin is set to 'nuage' or'opencontrail' or 'plumgrid',
# include nuage or opencontrail or plumgrid core plugins