openstack/puppet-trove
Code Issues Proposed changes

Merge "Change sql_connection to connection."

Browse Source
This commit is contained in:
Jenkins 2015-04-01 01:19:02 +00:00 committed by Gerrit Code Review
commit 27f3940b92
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

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

3
manifests/conductor.pp
View File

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

2
manifests/db/sync.pp
View File

@ -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'],
}
}

4
manifests/taskmanager.pp
View File

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

2
spec/classes/trove_api_spec.rb
View File

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

2
spec/classes/trove_conductor_spec.rb
View File

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

2
spec/classes/trove_taskmanager_spec.rb
View File

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