summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMykyta Karpin <mkarpin@mirantis.com>2017-03-13 10:50:15 +0200
committerMykyta Karpin <mkarpin@mirantis.com>2017-03-13 10:50:15 +0200
commitab8a6958f99ebd1256664f8e0e6977aca0785a9c (patch)
tree4f7db4a7f23f2710b8bb6b82c7265a949524ce5c
parent798ee3a00064a929f77e127a1bca094bdc9491c7 (diff)
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
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Stanislaw Bogatkin <sbogatkin@mirantis.com> Code-Review+2: Denis Egorenko <degorenko@mirantis.com> Workflow+1: Denis Egorenko <degorenko@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 15 Mar 2017 12:15:17 +0000 Reviewed-on: https://review.openstack.org/444765 Project: openstack/fuel-library Branch: refs/heads/master
-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