From ea6c8d3ae528f2e6c0bdfc666681aff9c652add8 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquier@mirantis.com>
Date: Wed, 24 Aug 2016 15:50:24 +0200
Subject: [PATCH] Fix notification_driver for Cinder and Heat

Change-Id: Ic9fd9f7d71ba9dbd9f4979612aefb114176a96ad
Closes-Bug: #1616456
---
 deployment_scripts/puppet/manifests/cinder.pp     | 2 +-
 deployment_scripts/puppet/manifests/controller.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/cinder.pp b/deployment_scripts/puppet/manifests/cinder.pp
index c7a5d16c0..ab91efeaf 100644
--- a/deployment_scripts/puppet/manifests/cinder.pp
+++ b/deployment_scripts/puppet/manifests/cinder.pp
@@ -59,7 +59,7 @@ cinder_config { 'DEFAULT/notification_topics':
 }
 
 cinder_config { 'DEFAULT/notification_driver':
-  value  => $driver,
+  value  => 'messaging',
   notify => Service[$volume_service],
 }
 
diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp
index f6c915825..d1b64b887 100644
--- a/deployment_scripts/puppet/manifests/controller.pp
+++ b/deployment_scripts/puppet/manifests/controller.pp
@@ -216,7 +216,7 @@ if hiera('lma::collector::elasticsearch::server', false) or hiera('lma::collecto
     notify => Service[$heat_api_service, $heat_engine_service],
   }
   heat_config { 'DEFAULT/notification_driver':
-    value  => $driver,
+    value  => 'messaging',
     notify => Service[$heat_api_service, $heat_engine_service],
   }