neutron: enable nova-event-callback by default

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller.pp

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 06fffdc..fab5e90 100644 (file)
--- 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
@@ -327,7 +328,7 @@ if hiera('step') >= 3 {
 
     cinder::backend::rbd { $cinder_rbd_backend :
       rbd_pool        => hiera('cinder_rbd_pool_name'),
-      rbd_user        => 'openstack',
+      rbd_user        => hiera('ceph_client_user_name'),
       rbd_secret_uuid => hiera('ceph::profile::params::fsid'),
       require         => $cinder_pool_requires,
     }
@@ -381,7 +382,7 @@ if hiera('step') >= 3 {
     package {'nfs-utils': } ->
     cinder::backend::nfs { $cinder_nfs_backend :
       nfs_servers       => hiera('cinder_nfs_servers'),
-      nfs_mount_options => hiera('cinder_nfs_mount_options'),
+      nfs_mount_options => hiera('cinder_nfs_mount_options',''),
       nfs_shares_config => '/etc/cinder/shares-nfs.conf',
     }
   }
@@ -485,15 +486,6 @@ if hiera('step') >= 3 {
 
 if hiera('step') >= 4 {
   include ::keystone::cron::token_flush
-
-  include ::ceilometer::keystone::auth
-  include ::cinder::keystone::auth
-  include ::glance::keystone::auth
-  include ::heat::keystone::auth
-  include ::neutron::keystone::auth
-  include ::nova::keystone::auth
-  include ::swift::keystone::auth
-
 } #END STEP 4
 
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])