x
/
puppet-tuskar
Code Issues Proposed changes

Merge "Change puppet to match tuskar packaging and code"

This commit is contained in:
Jenkins 2015-06-29 22:20:56 +00:00 committed by Gerrit Code Review
parent e7e38a77f4 c43da2d635
commit 85a3991330
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

@ -125,7 +125,7 @@ class tuskar::api(
fail("Invalid db connection ${::tuskar::database_connection}")
}
tuskar_config {
'database/sql_connection': value => $::tuskar::database_connection, secret => true;
'database/connection': value => $::tuskar::database_connection, secret => true;
'database/sql_idle_timeout': value => $::tuskar::database_idle_timeoutl;
}
}

2
manifests/db/sync.pp
View File

@ -22,6 +22,6 @@ class tuskar::db::sync {
path => '/usr/bin',
user => 'tuskar',
refreshonly => true,
subscribe => [Package['tuskar-api'], Tuskar_config['database/sql_connection']],
subscribe => [Package['tuskar-api'], Tuskar_config['database/connection']],
}
}

4
manifests/params.pp
View File

@ -4,8 +4,8 @@ class tuskar::params {
case $::osfamily {
'RedHat': {
$client_package_name = 'openstack-tuskar'
$api_package_name = 'openstack-tuskar-api'
$client_package_name = 'python-tuskarclient'
$api_package_name = 'openstack-tuskar'
$api_service_name = 'openstack-tuskar-api'
$ui_package_name = 'openstack-tuskar-ui'
$ui_extras_package_name = 'openstack-tuskar-ui-extras'

6
spec/classes/tuskar_api_spec.rb
View File

@ -49,8 +49,8 @@ describe 'tuskar::api' do
database_connection => 'mysql://tuskar:pass@10.0.0.1/tuskar'}"
end
it 'configures tuskar-api with RabbitMQ' do
is_expected.to contain_tuskar_config('database/sql_connection').with_value('mysql://tuskar:pass@10.0.0.1/tuskar')
is_expected.to contain_tuskar_config('database/sql_connection').with_value('mysql://tuskar:pass@10.0.0.1/tuskar').with_secret(true)
is_expected.to contain_tuskar_config('database/connection').with_value('mysql://tuskar:pass@10.0.0.1/tuskar')
is_expected.to contain_tuskar_config('database/connection').with_value('mysql://tuskar:pass@10.0.0.1/tuskar').with_secret(true)
end
end
end
@ -79,7 +79,7 @@ describe 'tuskar::api' do
end
let :platform_params do
{ :api_package_name => 'openstack-tuskar-api',
{ :api_package_name => 'openstack-tuskar',
:api_service_name => 'openstack-tuskar-api' }
end