diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-01-23 17:32:37 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-01-23 17:32:37 +0000 |
commit | 1d7167e0b70b6d3da195287aff81c191de900ca5 (patch) | |
tree | b88a999a68ecb15474108342738482ffc22715bd /puppet/manifests/overcloud_controller.pp | |
parent | 5e695df655137b31a2536e80080c67dbf9a94415 (diff) | |
parent | dbeb6378c51748e98b494d11815025d9f4263d4f (diff) |
Merge "puppet: allow config of ad-hoc Neutron settings"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 |
1 files changed, 1 insertions, 0 deletions
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 |