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

2016-01-23 17:32:37 +00:00
parent 5e695df655 dbeb6378c5
commit 1d7167e0b7
3 changed files with 3 additions and 0 deletions
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -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,
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -285,6 +285,7 @@ if hiera('step') >= 3 {
    include ::neutron
  }

+  include ::neutron::config
  include ::neutron::server
  include ::neutron::server::notifications

--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -649,6 +649,7 @@ if hiera('step') >= 3 {
    include ::neutron
  }

+  include ::neutron::config
  class { '::neutron::server' :
    sync_db        => $sync_db,
    manage_service => false,