openstack/puppet-watcher
Code Issues Proposed changes

Debian is using python3-watcherclient

Browse Source 
Change-Id: I60c2a73f20bc0ba75c0d90ed8b640e8120949956
This commit is contained in:
zhubingbing 2018-04-12 11:48:31 +08:00
parent 8f0e944fa7
commit 807bac00a5
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@ -4,6 +4,12 @@ class watcher::params {
include ::openstacklib::defaults
$group = 'watcher'
if ($::os_package_type == 'debian') {
$pyvers = '3'
} else {
$pyvers = ''
}
case $::osfamily {
'RedHat': {
$api_service_name = 'openstack-watcher-api'
@ -25,7 +31,7 @@ class watcher::params {
$applier_service_name = 'watcher-applier'
$decision_engine_package_name = 'watcher-decision-engine'
$decision_engine_service_name = 'watcher-decision-engine'
$client_package_name = 'python-watcherclient'
$client_package_name = "python${pyvers}-watcherclient"
$watcher_wsgi_script_source = '/usr/lib/python2.7/dist-packages/watcher/api/app.wsgi'
$watcher_wsgi_script_path = '/usr/lib/cgi-bin/watcher'
}

13
spec/classes/watcher_client_spec.rb
View File

@ -24,8 +24,17 @@ describe 'watcher::client' do
facts.merge!(OSDefaults.get_facts())
end
let :platform_params do
{ :client_package_name => 'python-watcherclient' }
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-watcherclient' }
else
{ :client_package_name => 'python-watcherclient' }
end
when 'RedHat'
{ :client_package_name => 'python-watcherclient' }
end
end
it_behaves_like 'watcher client'