Debian is using Python 3
ACK Debian's switch to Python 3 Change-Id: I2f88ba6a6ecd18f9d2719fff869045f4c5b9be69
This commit is contained in:
parent
7023c98764
commit
12ade99544
|
@ -3,7 +3,13 @@
|
||||||
class aodh::params {
|
class aodh::params {
|
||||||
include ::openstacklib::defaults
|
include ::openstacklib::defaults
|
||||||
|
|
||||||
$client_package_name = 'python-aodhclient'
|
if ($::os_package_type == 'debian') {
|
||||||
|
$pyvers = '3'
|
||||||
|
} else {
|
||||||
|
$pyvers = ''
|
||||||
|
}
|
||||||
|
|
||||||
|
$client_package_name = "python${pyvers}-aodhclient"
|
||||||
$group = 'aodh'
|
$group = 'aodh'
|
||||||
|
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
|
@ -45,7 +51,7 @@ class aodh::params {
|
||||||
$listener_service_name = 'aodh-listener'
|
$listener_service_name = 'aodh-listener'
|
||||||
$aodh_wsgi_script_path = '/usr/lib/cgi-bin/aodh'
|
$aodh_wsgi_script_path = '/usr/lib/cgi-bin/aodh'
|
||||||
$aodh_wsgi_script_source = '/usr/share/aodh/app.wsgi'
|
$aodh_wsgi_script_source = '/usr/share/aodh/app.wsgi'
|
||||||
$redis_package_name = 'python-redis'
|
$redis_package_name = "python${pyvers}-redis"
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
fail("Unsupported osfamily: ${::osfamily} operatingsystem")
|
fail("Unsupported osfamily: ${::osfamily} operatingsystem")
|
||||||
|
|
|
@ -24,6 +24,19 @@ describe 'aodh::client' do
|
||||||
facts.merge!(OSDefaults.get_facts())
|
facts.merge!(OSDefaults.get_facts())
|
||||||
end
|
end
|
||||||
|
|
||||||
|
let(:platform_params) do
|
||||||
|
case facts[:osfamily]
|
||||||
|
when 'Debian'
|
||||||
|
if facts[:os_package_type] == 'debian'
|
||||||
|
{ :client_package_name => 'python3-aodhclient' }
|
||||||
|
else
|
||||||
|
{ :client_package_name => 'python-aodhclient' }
|
||||||
|
end
|
||||||
|
when 'RedHat'
|
||||||
|
{ :client_package_name => 'python-aodhclient' }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
it_configures 'aodh client'
|
it_configures 'aodh client'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue