diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-05-11 11:34:57 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-06-09 10:44:58 -0400 |
| commit | 08a201e23853455ffce6ff0d6c72163547ae7c06 (patch) | |
| tree | 347e2e2f675b68163e8683be010d6261fcf0675c /puppet/manifests | |
| parent | f89de8512b39f3fd4af48c4812eea336ea59f02a (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')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 3 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 9 |
2 files changed, 0 insertions, 12 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 diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 10f0398c..a2322bef 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': @@ -451,12 +448,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 } |