From 74409e5f5982b17cd614a7432204623bd004ad38 Mon Sep 17 00:00:00 2001
From: ZTE-SuZhengwei <su.zhengwei@zte.com.cn>
Date: Tue, 28 Jun 2016 16:30:41 +0800
Subject: [PATCH] Fix inconsistent between puppet and install guide

notification_driver configure inconsistent between
puppet-glance/cinder and install-guide-rdo

Change-Id: Icdf05cd99caf864431467bafd2572c9f0685b61c
Closes-bug: #1595804
---
 manifests/ceilometer.pp                | 2 +-
 spec/classes/cinder_ceilometer_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp
index c13374b3..60f05b83 100644
--- a/manifests/ceilometer.pp
+++ b/manifests/ceilometer.pp
@@ -18,6 +18,6 @@ class cinder::ceilometer (
 ) {
 
   cinder_config {
-    'DEFAULT/notification_driver': value => $notification_driver;
+    'oslo_messaging_notifications/driver': value => $notification_driver;
   }
 }
diff --git a/spec/classes/cinder_ceilometer_spec.rb b/spec/classes/cinder_ceilometer_spec.rb
index 1d268c1a..9e8dcefe 100644
--- a/spec/classes/cinder_ceilometer_spec.rb
+++ b/spec/classes/cinder_ceilometer_spec.rb
@@ -4,7 +4,7 @@ describe 'cinder::ceilometer' do
 
   describe 'with default parameters' do
     it 'contains default values' do
-      is_expected.to contain_cinder_config('DEFAULT/notification_driver').with(
+      is_expected.to contain_cinder_config('oslo_messaging_notifications/driver').with(
         :value => 'messagingv2')
     end
   end