aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2015-09-21 13:46:02 -0400
committerEmilien Macchi <emilien@redhat.com>2015-11-17 12:09:28 -0500
commit28d5d566f95dfade66d7c48c4b9565842c4571ad (patch)
tree09797fdd304e7e3685baff3652cd5187bf452453 /puppet/manifests
parent2f2271a6a32d1b5b8f0008901b5163d65b0dc428 (diff)
neutron: enable nova-event-callback by default
* Add NovaApiVirtualIP string parameter. * Compute nova_url and nova_admin_auth_url parameters. * Configure in Hiera neutron::server::notifications::* parameters. * non-ha: include ::neutron::server::notifications * ha: include ::neutron::server::notifications and create orchestration * Set vif_plugging_is_fatal to True so we actually fail if Neutron is not able to create the VIF during Nova server creation workflow. Depends-On: I21dc10396e92906eab4651c318aa2ee62a8e03c7 Change-Id: I02e41f87404e0030d488476680af2f6d45af94ff
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 34be39f3..fab5e90a 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 b9623714..dac017ea 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,