Inherit pyvers from openstacklib::defaults
Change-Id: Ib6bdfb2f1ac501441fd3b65f336334fc281cef79
This commit is contained in:
parent
222a88ee66
commit
757d6d7349
@ -5,17 +5,8 @@
|
|||||||
class zaqar::params {
|
class zaqar::params {
|
||||||
include ::openstacklib::defaults
|
include ::openstacklib::defaults
|
||||||
|
|
||||||
if ($::os_package_type == 'debian') {
|
$pyvers = $::openstacklib::defaults::pyvers
|
||||||
$pyvers = '3'
|
$pyver3 = $::openstacklib::defaults::pyver3
|
||||||
$pyver3 = '3'
|
|
||||||
} elsif ($::os['name'] == 'Fedora') or
|
|
||||||
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
|
|
||||||
$pyvers = '3'
|
|
||||||
$pyver3 = '3.6'
|
|
||||||
} else {
|
|
||||||
$pyvers = ''
|
|
||||||
$pyver3 = '2.7'
|
|
||||||
}
|
|
||||||
|
|
||||||
$client_package_name = "python${pyvers}-zaqarclient"
|
$client_package_name = "python${pyvers}-zaqarclient"
|
||||||
$group = 'zaqar'
|
$group = 'zaqar'
|
||||||
|
@ -27,11 +27,7 @@ describe 'zaqar::client' do
|
|||||||
let(:platform_params) do
|
let(:platform_params) do
|
||||||
case facts[:osfamily]
|
case facts[:osfamily]
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
if facts[:os_package_type] == 'debian'
|
{ :client_package_name => 'python3-zaqarclient' }
|
||||||
{ :client_package_name => 'python3-zaqarclient' }
|
|
||||||
else
|
|
||||||
{ :client_package_name => 'python-zaqarclient' }
|
|
||||||
end
|
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :client_package_name => 'python-zaqarclient' }
|
{ :client_package_name => 'python-zaqarclient' }
|
||||||
end
|
end
|
||||||
|
@ -94,7 +94,7 @@ describe 'zaqar::wsgi::apache' do
|
|||||||
:httpd_service_name => 'apache2',
|
:httpd_service_name => 'apache2',
|
||||||
:httpd_ports_file => '/etc/apache2/ports.conf',
|
:httpd_ports_file => '/etc/apache2/ports.conf',
|
||||||
:wsgi_script_path => '/usr/lib/cgi-bin/zaqar',
|
:wsgi_script_path => '/usr/lib/cgi-bin/zaqar',
|
||||||
:wsgi_script_source => '/usr/lib/python2.7/dist-packages/zaqar/transport/wsgi/app.py'
|
:wsgi_script_source => '/usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py'
|
||||||
}
|
}
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user