From: Xingchao Yu <xingchao@unitedstack.com>
Date: Mon, 9 Sep 2013 10:49:38 +0000 (+0800)
Subject: Use connection to replace deprecated database_connection
X-Git-Tag: 3.0.0-rc2~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b7f74dfe9628c07a8c92df3d3778c241b5ed6ecc;p=puppet-modules%2Fpuppet-ceilometer.git

Use connection to replace deprecated database_connection

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

Fixes bug #1222744

Change-Id: I82082b791a4c16eb50092b3a96fb8ae439af4e5b
---

diff --git a/manifests/db.pp b/manifests/db.pp
index 1b59288..7a77b95 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -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']
   }
 
 }
diff --git a/spec/classes/ceilometer_db_spec.rb b/spec/classes/ceilometer_db_spec.rb
index c1f6312..7e497a4 100644
--- a/spec/classes/ceilometer_db_spec.rb
+++ b/spec/classes/ceilometer_db_spec.rb
@@ -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