summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-10 14:46:34 +0000
committerGerrit Code Review <review@openstack.org>2016-06-10 14:46:35 +0000
commita671a30b5196aa5953576928be526d70aed265fe (patch)
tree0b5e3280f91691601f133b5425d1df86899063cd /puppet/manifests
parentdae80694cbd9dee56ea9a530c421b6a2f456a691 (diff)
parent08a201e23853455ffce6ff0d6c72163547ae7c06 (diff)
Merge "composable neutron server"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp3
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp9
2 files changed, 0 insertions, 12 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 87776ea9..342be56d 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
}
@@ -220,8 +219,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
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index f5f5f73d..ed5af881 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -278,9 +278,6 @@ if hiera('step') >= 2 {
class { '::nova::db::mysql_api':
require => Exec['galera-ready'],
}
- class { '::neutron::db::mysql':
- require => Exec['galera-ready'],
- }
if downcase(hiera('ceilometer_backend')) == 'mysql' {
class { '::ceilometer::db::mysql':
@@ -447,12 +444,6 @@ MYSQL_HOST=localhost\n",
}
include ::neutron::config
- class { '::neutron::server' :
- sync_db => $sync_db,
- manage_service => false,
- enabled => false,
- }
- include ::neutron::server::notifications
if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
include ::neutron::plugins::nuage
}