summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-15 12:15:17 +0000
committerGerrit Code Review <review@openstack.org>2017-03-15 12:15:17 +0000
commitae83b6d76d0830f6de4a2be2996943a943ebe504 (patch)
tree87f385a66d6f93af116db33d59ac1422c4ae01cd
parent472a590d61833389db80fab480d7d6d26f5ecbc8 (diff)
parentab8a6958f99ebd1256664f8e0e6977aca0785a9c (diff)
Merge "Use notification_driver parameter in sahara::notify"
-rw-r--r--deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp2
-rw-r--r--tests/noop/spec/hosts/sahara/sahara_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
index 99ebf24..337a776 100644
--- a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
+++ b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
@@ -142,7 +142,7 @@ class openstack_tasks::sahara::sahara {
142 142
143 if $ceilometer_hash['enabled'] { 143 if $ceilometer_hash['enabled'] {
144 class { '::sahara::notify': 144 class { '::sahara::notify':
145 enable_notifications => true, 145 notification_driver => $ceilometer_hash['notification_driver'],
146 } 146 }
147 } 147 }
148 148
diff --git a/tests/noop/spec/hosts/sahara/sahara_spec.rb b/tests/noop/spec/hosts/sahara/sahara_spec.rb
index 005cc83..bf386ad 100644
--- a/tests/noop/spec/hosts/sahara/sahara_spec.rb
+++ b/tests/noop/spec/hosts/sahara/sahara_spec.rb
@@ -190,7 +190,7 @@ describe manifest do
190 context 'with ceilometer', :if => enable do 190 context 'with ceilometer', :if => enable do
191 it 'should declare sahara::notify class correctly' do 191 it 'should declare sahara::notify class correctly' do
192 should contain_class('sahara::notify').with( 192 should contain_class('sahara::notify').with(
193 'enable_notifications' => true 193 'notification_driver' => Noop.hiera_structure('ceilometer/notification_driver')
194 ) 194 )
195 end 195 end
196 end 196 end