diff --git a/manifests/api.pp b/manifests/api.pp index e0ddbce..25b9dc7 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -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; } } diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 736777b..631d578 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -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']], } } diff --git a/manifests/params.pp b/manifests/params.pp index 64a6d09..fe844a9 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' diff --git a/spec/classes/tuskar_api_spec.rb b/spec/classes/tuskar_api_spec.rb index 122ae55..b6c4f34 100644 --- a/spec/classes/tuskar_api_spec.rb +++ b/spec/classes/tuskar_api_spec.rb @@ -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