Browse Source

Merge "Use notification_driver parameter in sahara::notify"

Jenkins 2 years ago
parent
commit
ae83b6d76d

+ 1
- 1
deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp View File

@@ -142,7 +142,7 @@ class openstack_tasks::sahara::sahara {
142 142
 
143 143
     if $ceilometer_hash['enabled'] {
144 144
       class { '::sahara::notify':
145
-        enable_notifications => true,
145
+        notification_driver => $ceilometer_hash['notification_driver'],
146 146
       }
147 147
     }
148 148
 

+ 1
- 1
tests/noop/spec/hosts/sahara/sahara_spec.rb View File

@@ -190,7 +190,7 @@ describe manifest do
190 190
       context 'with ceilometer', :if => enable do
191 191
         it 'should declare sahara::notify class correctly' do
192 192
           should contain_class('sahara::notify').with(
193
-                     'enable_notifications' => true
193
+                   'notification_driver' => Noop.hiera_structure('ceilometer/notification_driver')
194 194
                  )
195 195
         end
196 196
       end

Loading…
Cancel
Save