diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-02-29 09:29:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-02-29 09:29:27 +0000 |
commit | 27b58c81ce4e3141dac2f137fb9a2bca42ee88ef (patch) | |
tree | faf2942d751ca53ce804d2707d4f12db35d63f82 /puppet/manifests/overcloud_controller_pacemaker.pp | |
parent | fe0b757bd454f26dd2f2a3423ba5a684899bae61 (diff) | |
parent | a1164462bf15b548e3111c1eea663a37d1ae9e7a (diff) |
Merge "Enable notifications on the overcloud"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 21011812..20ff49cd 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -577,6 +577,10 @@ if hiera('step') >= 3 { enabled => false, } include join(['::glance::backend::', $glance_backend]) + $rabbit_port = hiera('rabbitmq::port') + class { '::glance::notify::rabbitmq': + rabbit_hosts => suffix(hiera('rabbit_node_ips'), ":${rabbit_port}"), + } class { '::nova' : memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'), @@ -743,6 +747,9 @@ if hiera('step') >= 3 { neutron_dhcp_agent_config { 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false); } + neutron_config { + 'DEFAULT/notification_driver': value => 'messaging'; + } include ::cinder include ::cinder::config @@ -761,6 +768,7 @@ if hiera('step') >= 3 { enabled => false, } include ::cinder::glance + include ::cinder::ceilometer class { '::cinder::setup_test_volume': size => join([hiera('cinder_lvm_loop_device_size'), 'M']), } @@ -987,7 +995,8 @@ if hiera('step') >= 3 { # Heat include ::heat::config class { '::heat' : - sync_db => $sync_db, + sync_db => $sync_db, + notification_driver => 'messaging', } class { '::heat::api' : manage_service => false, |