openstack
/
puppet-gnocchi
Code Issues Proposed changes

Debian is using python 3 & path to wsgi script 

This patch fixes 2 things:
- path to the wsgi script.
- uses python3-* packages in Debian.

Change-Id: I2297f919c8b91ef723b8c6e1ee1c7c679553d339
This commit is contained in:
Thomas Goirand 2018-05-07 13:22:28 +02:00
parent d6d2466673
commit 1eb58aac2c
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/params.pp
View File

@ -12,7 +12,7 @@ class gnocchi::params {
}
$client_package_name = "python${pyvers}-gnocchiclient"
$rados_package_name = 'python-rados'
$rados_package_name = "python${pyvers}-rados"
$common_package_name = 'gnocchi-common'
$api_service_name = 'gnocchi-api'
$metricd_package_name = 'gnocchi-metricd'
@ -33,18 +33,18 @@ class gnocchi::params {
$redis_package_name = 'python-redis'
}
'Debian': {
if $::operatingsystem == 'Ubuntu' {
if $::os_package_type == 'debian' {
$api_package_name = 'gnocchi-api'
$gnocchi_wsgi_script_source = '/usr/share/gnocchi-api'
} else {
$api_package_name = 'python-gnocchi'
$gnocchi_wsgi_script_source = '/usr/bin/python2-gnocchi-api'
} else {
$api_package_name = 'gnocchi-api'
$gnocchi_wsgi_script_source = '/usr/share/gnocchi-common/app.wsgi'
}
$sqlite_package_name = 'python-pysqlite2'
$gnocchi_wsgi_script_path = '/usr/lib/cgi-bin/gnocchi'
$pymysql_package_name = 'python-pymysql'
$redis_package_name = 'python-redis'
$pymysql_package_name = "python${pyvers}-pymysql"
$redis_package_name = "python${pyvers}-redis"
$cradox_package_name = undef
}
default: {

11
spec/classes/gnocchi_api_spec.rb
View File

@ -178,9 +178,14 @@ describe 'gnocchi::api' do
end
let(:platform_params) do
if facts[:operatingsystem] == 'Ubuntu' then
package_name = 'python-gnocchi'
else
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian' then
package_name = 'gnocchi-api'
else
package_name = 'python-gnocchi'
end
when 'RedHat'
package_name = 'gnocchi-api'
end
{ :api_package_name => package_name,

6
spec/classes/gnocchi_wsgi_apache_spec.rb
View File

@ -92,10 +92,10 @@ describe 'gnocchi::wsgi::apache' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:operatingsystem] == 'Ubuntu' then
script_source = '/usr/bin/python2-gnocchi-api'
if facts[:os_package_type] == 'debian' then
script_source = '/usr/bin/gnocchi-api'
else
script_source = '/usr/share/gnocchi-common/app.wsgi'
script_source = '/usr/bin/python2-gnocchi-api'
end
{
:httpd_service_name => 'apache2',