From b032aca232c23f22d8324b03d146c0d19b03fa65 Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Tue, 24 Mar 2015 15:50:03 +0100 Subject: [PATCH] Change sql_connection to connection. Sql connection parameter is now in database/connection not DEFAULT/sql_connection. Change-Id: I5f7b48a1a6e092b9629145b57795cba0c351a4eb --- manifests/api.pp | 4 ++-- manifests/conductor.pp | 3 ++- manifests/db/sync.pp | 2 +- manifests/taskmanager.pp | 4 ++-- spec/classes/trove_api_spec.rb | 2 +- spec/classes/trove_conductor_spec.rb | 2 +- spec/classes/trove_taskmanager_spec.rb | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index 1dfbba46..a62759f8 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -167,8 +167,8 @@ class trove::api( fail("Invalid db connection ${::trove::database_connection}") } trove_config { - 'DEFAULT/sql_connection': value => $::trove::database_connection; - 'DEFAULT/sql_idle_timeout': value => $::trove::database_idle_timeoutl; + 'database/connection': value => $::trove::database_connection; + 'database/idle_timeout': value => $::trove::database_idle_timeoutl; } } diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 6b348cc3..5a68bcc0 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -82,7 +82,8 @@ class trove::conductor( fail("Invalid db connection ${::trove::database_connection}") } trove_conductor_config { - 'DEFAULT/sql_connection': value => $::trove::database_connection; + 'database/connection': value => $::trove::database_connection; + 'database/idle_timeout': value => $::trove::database_idle_timeoutl; } } diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 2d39ee52..9d3f947e 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -22,6 +22,6 @@ class trove::db::sync { path => '/usr/bin', user => 'trove', refreshonly => true, - subscribe => Trove_config['DEFAULT/sql_connection'], + subscribe => Trove_config['database/connection'], } } diff --git a/manifests/taskmanager.pp b/manifests/taskmanager.pp index 814ed1f6..5ac9d264 100644 --- a/manifests/taskmanager.pp +++ b/manifests/taskmanager.pp @@ -104,8 +104,8 @@ class trove::taskmanager( fail("Invalid db connection ${::trove::database_connection}") } trove_taskmanager_config { - 'DEFAULT/sql_connection': value => $::trove::database_connection; - 'DEFAULT/sql_idle_timeout': value => $::trove::database_idle_timeoutl; + 'database/connection': value => $::trove::database_connection; + 'database/idle_timeout': value => $::trove::database_idle_timeoutl; } } diff --git a/spec/classes/trove_api_spec.rb b/spec/classes/trove_api_spec.rb index ac53a4e5..56ddb1bc 100644 --- a/spec/classes/trove_api_spec.rb +++ b/spec/classes/trove_api_spec.rb @@ -103,7 +103,7 @@ describe 'trove::api' do database_connection => 'mysql://trove:pass@10.0.0.1/trove'}" end it 'configures trove-api with RabbitMQ' do - is_expected.to contain_trove_config('DEFAULT/sql_connection').with_value('mysql://trove:pass@10.0.0.1/trove') + is_expected.to contain_trove_config('database/connection').with_value('mysql://trove:pass@10.0.0.1/trove') end end end diff --git a/spec/classes/trove_conductor_spec.rb b/spec/classes/trove_conductor_spec.rb index 1d0bd8f9..d3dc4c52 100644 --- a/spec/classes/trove_conductor_spec.rb +++ b/spec/classes/trove_conductor_spec.rb @@ -62,7 +62,7 @@ describe 'trove::conductor' do database_connection => 'mysql://trove:pass@10.0.0.1/trove'}" end it 'configures trove-conductor with RabbitMQ' do - is_expected.to contain_trove_conductor_config('DEFAULT/sql_connection').with_value('mysql://trove:pass@10.0.0.1/trove') + is_expected.to contain_trove_conductor_config('database/connection').with_value('mysql://trove:pass@10.0.0.1/trove') end end end diff --git a/spec/classes/trove_taskmanager_spec.rb b/spec/classes/trove_taskmanager_spec.rb index 2ce2fdc2..6c2ffc68 100644 --- a/spec/classes/trove_taskmanager_spec.rb +++ b/spec/classes/trove_taskmanager_spec.rb @@ -81,7 +81,7 @@ describe 'trove::taskmanager' do database_connection => 'mysql://trove:pass@10.0.0.1/trove'}" end it 'configures trove-taskmanager with RabbitMQ' do - is_expected.to contain_trove_taskmanager_config('DEFAULT/sql_connection').with_value('mysql://trove:pass@10.0.0.1/trove') + is_expected.to contain_trove_taskmanager_config('database/connection').with_value('mysql://trove:pass@10.0.0.1/trove') end end