diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-01-18 09:10:30 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-01-22 10:30:42 -0500 |
| commit | dbeb6378c51748e98b494d11815025d9f4263d4f (patch) | |
| tree | 6d8fdb3e90db24cdc1bd03c9ef92111f07eb9a41 /puppet/manifests | |
| parent | dced4001f2c1ba52a42f38bab43bc8e275f4e9fc (diff) | |
puppet: allow config of ad-hoc Neutron settings
Including ::neutron::config on the controller and compute roles
will allow ad-hoc (non-puppet managed) settings to be made in all
the various neutron config files using Hiera.
Change-Id: Ifadc77cdcb60b7075d091d778cb92b0dd75bd949
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 06efd6d1..593cc500 100644 --- 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, diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 5eb924ef..70aebddd 100644 --- 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 diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 1f3962f2..a9adbd5d 100644 --- 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, |