Merge pull request #113 from enovance/bug/112/emilien

volume/common: re-enable telemetry config
This commit is contained in:
Gonéri Le Bouder 2014-01-29 06:34:59 -08:00
commit db92fe1440
2 changed files with 2 additions and 10 deletions

View File

@ -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': }
}

View File

@ -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