openstack
/
puppet-ceilometer
Code Issues Proposed changes

Use connection to replace depreacted database_connection 

This patch is aim to use new param connection in [database]
section to replace the depreacted option database_connection
in [DEFAULT].

Fixes bug #1222744

Change-Id: I82082b791a4c16eb50092b3a96fb8ae439af4e5b
This commit is contained in:
Xingchao Yu 2013-09-09 18:49:38 +08:00
parent 9ac4a3c915
commit 75e899f363
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/db.pp
View File

@ -44,10 +44,10 @@ class ceilometer::db (
}
ceilometer_config {
'DEFAULT/database_connection': value => $database_connection;
'database/connection': value => $database_connection;
}
Ceilometer_config['DEFAULT/database_connection'] ~> Exec['ceilometer-dbsync']
Ceilometer_config['database/connection'] ~> Exec['ceilometer-dbsync']
exec { 'ceilometer-dbsync':
command => $::ceilometer::params::dbsync_command,
@ -55,7 +55,7 @@ class ceilometer::db (
user => $::ceilometer::params::username,
refreshonly => true,
logoutput => on_failure,
subscribe => Ceilometer_config['DEFAULT/database_connection']
subscribe => Ceilometer_config['database/connection']
}
}

3
spec/classes/ceilometer_db_spec.rb
View File

@ -18,6 +18,7 @@ describe 'ceilometer::db' do
should contain_package('ceilometer-backend-package').with(
:ensure => 'present',
:name => 'python-pymongo')
should contain_ceilometer_config('database/connection').with_value('mongodb://localhost:1234/ceilometer')
end
end
@ -40,6 +41,7 @@ describe 'ceilometer::db' do
should contain_package('ceilometer-backend-package').with(
:ensure => 'present',
:name => 'python-pymongo')
should contain_ceilometer_config('database/connection').with_value('mongodb://localhost:1234/ceilometer')
end
end
@ -84,6 +86,7 @@ describe 'ceilometer::db' do
should contain_package('ceilometer-backend-package').with(
:ensure => 'present',
:name => 'python-sqlite2')
should contain_ceilometer_config('database/connection').with_value('sqlite:///var/lib/ceilometer.db')
end
end