diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-17 20:13:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-17 20:13:41 +0000 |
| commit | 6604208fa88956c667f60c0e54663de5908d4edc (patch) | |
| tree | 0cb31feaec5399682b64a418047e99e299e11601 /puppet/manifests | |
| parent | cde9207a0da4968cb731937f5e7012a1d646bb00 (diff) | |
| parent | 28d5d566f95dfade66d7c48c4b9565842c4571ad (diff) | |
Merge "neutron: enable nova-event-callback by default"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 63f89ec0..570c43ba 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -227,6 +227,7 @@ if hiera('step') >= 3 { include ::neutron include ::neutron::server + include ::neutron::server::notifications include ::neutron::agents::l3 include ::neutron::agents::dhcp include ::neutron::agents::metadata diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 02988412..2a3f1f92 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -590,6 +590,7 @@ if hiera('step') >= 3 { manage_service => false, enabled => false, } + include ::neutron::server::notifications class { '::neutron::agents::dhcp' : manage_service => false, enabled => false, |