Merge "Use notification_driver parameter in sahara::notify"
This commit is contained in:
commit
ae83b6d76d
|
@ -142,7 +142,7 @@ class openstack_tasks::sahara::sahara {
|
||||||
|
|
||||||
if $ceilometer_hash['enabled'] {
|
if $ceilometer_hash['enabled'] {
|
||||||
class { '::sahara::notify':
|
class { '::sahara::notify':
|
||||||
enable_notifications => true,
|
notification_driver => $ceilometer_hash['notification_driver'],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -190,7 +190,7 @@ describe manifest do
|
||||||
context 'with ceilometer', :if => enable do
|
context 'with ceilometer', :if => enable do
|
||||||
it 'should declare sahara::notify class correctly' do
|
it 'should declare sahara::notify class correctly' do
|
||||||
should contain_class('sahara::notify').with(
|
should contain_class('sahara::notify').with(
|
||||||
'enable_notifications' => true
|
'notification_driver' => Noop.hiera_structure('ceilometer/notification_driver')
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue