openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use puppet parameter for Heat notifications 

When the original change merged, the puppet module change to expose
the notification_driver as a top-level param had not been backported.
It looks like it now has, so this is breaking all of our stable
deployments because the config option is being set twice.

Change-Id: I5c50e4c458ed9f4ad37114550a22d297593af0f6
Closes-Bug: 1555803
This commit is contained in:
Ben Nemec 2016-03-10 14:32:17 -06:00
parent 2fd7e6ae8b
commit e680b54e99
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/hieradata/controller.yaml
View File

@ -97,6 +97,7 @@ cinder_user_enabled_backends: []
heat::engine::configure_delegated_roles: false
heat::engine::trusts_delegated_roles: []
heat::instance_user: ''
heat::notification_driver: 'messaging'
# pacemaker
pacemaker::corosync::cluster_name: 'tripleo_cluster'

3
puppet/manifests/overcloud_controller.pp
View File

@ -581,9 +581,6 @@ if hiera('step') >= 3 {
include ::heat::api_cfn
include ::heat::api_cloudwatch
include ::heat::engine
heat_config {
'DEFAULT/notification_driver': value => 'messaging';
}
# Horizon
if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {

3
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -1060,9 +1060,6 @@ if hiera('step') >= 3 {
manage_service => false,
enabled => false,
}
heat_config {
'DEFAULT/notification_driver': value => 'messaging';
}
# httpd/apache and horizon
# NOTE(gfidente): server-status can be consumed by the pacemaker resource agent