openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "puppet: allow config of ad-hoc Neutron settings"

Browse Source
This commit is contained in:
Jenkins 2016-01-23 17:32:37 +00:00 committed by Gerrit Code Review
commit 1d7167e0b7
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/manifests/overcloud_compute.pp
View File

@ -79,6 +79,7 @@ if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2'
}
include ::nova::network::neutron
include ::neutron
include ::neutron::config
# If the value of core plugin is set to 'nuage',
# include nuage agent,

1
puppet/manifests/overcloud_controller.pp
View File

@ -285,6 +285,7 @@ if hiera('step') >= 3 {
include ::neutron
}
include ::neutron::config
include ::neutron::server
include ::neutron::server::notifications

1
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -649,6 +649,7 @@ if hiera('step') >= 3 {
include ::neutron
}
include ::neutron::config
class { '::neutron::server' :
sync_db => $sync_db,
manage_service => false,