From ab8a6958f99ebd1256664f8e0e6977aca0785a9c Mon Sep 17 00:00:00 2001 From: Mykyta Karpin Date: Mon, 13 Mar 2017 10:50:15 +0200 Subject: [PATCH] Use notification_driver parameter in sahara::notify Upstream will remove enable_notifications parameter [1], we need to use notification_driver parameter now. [1] https://review.openstack.org/#/c/444051/ Change-Id: I95fbb5f104b3d550a87aaaad51418c918fe70c79 --- deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp | 2 +- tests/noop/spec/hosts/sahara/sahara_spec.rb | 2 +- 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 99ebf249d5..337a77689e 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 { if $ceilometer_hash['enabled'] { class { '::sahara::notify': - enable_notifications => true, + notification_driver => $ceilometer_hash['notification_driver'], } } diff --git a/tests/noop/spec/hosts/sahara/sahara_spec.rb b/tests/noop/spec/hosts/sahara/sahara_spec.rb index 005cc83f15..bf386ad001 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 context 'with ceilometer', :if => enable do it 'should declare sahara::notify class correctly' do should contain_class('sahara::notify').with( - 'enable_notifications' => true + 'notification_driver' => Noop.hiera_structure('ceilometer/notification_driver') ) end end