From 6feaee109f54b3f55c73ef33d0083cee9d0a6502 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 29 Jan 2014 15:18:41 +0100 Subject: [PATCH] volume/common: re-enable telemetry config It was disabled due to LP #1266259. Close #112 Signed-off-by: Emilien Macchi --- manifests/volume.pp | 8 +------- spec/classes/cloud_volume_controller_spec.rb | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/manifests/volume.pp b/manifests/volume.pp index 22a3d5be..3fe3cccb 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -44,12 +44,6 @@ class cloud::volume( use_syslog => true } - #TODO(EmilienM) While https://review.openstack.org/#/c/65008/ got merged - # we can't declare ceilometer class due to bug LP #1266259 - # class { 'cinder::ceilometer': } - # Temp fix: - cinder_config { - 'DEFAULT/notification_driver': value => 'cinder.openstack.common.notifier.rpc_notifier'; - } + class { 'cinder::ceilometer': } } diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb index 48072747..ec096093 100644 --- a/spec/classes/cloud_volume_controller_spec.rb +++ b/spec/classes/cloud_volume_controller_spec.rb @@ -57,9 +57,7 @@ describe 'cloud::volume::controller' do :log_facility => 'LOG_LOCAL0', :use_syslog => true ) - - should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier') - + should contain_class('cinder::ceilometer') end it 'configure cinder scheduler' do