openstack/puppet-panko
Code Issues Proposed changes

Panko api wsgi changed path for Ubuntu

Browse Source 
When installing the panko-api and panko-common
packages for Ubuntu the path to the wsgi script is
no longer /usr/share/panko-common/app.wsgi but is
now /usr/lib/python2.7/dist-packages/panko/api/app.wsgi

This patch changes that script path. It depends on the
Gnocchi change in order to test this since Gnocchi has
to be fixed in order to run testing. [1]

[1] https://review.openstack.org/#/c/548032/

Depends-On: I070f88dd40ca4129cbd3abf5b4f5ecb511b2895e
Change-Id: I066bd87ce839d380942adcb73fcaa6d915f801c1
This commit is contained in:
Tobias Urdin 2018-02-27 15:05:29 +01:00
parent 205983aca7
commit 4a890fc2f1
3 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@ -19,7 +19,7 @@ class panko::params {
$api_package_name = 'panko-api'
$api_service_name = 'panko-api'
$panko_wsgi_script_path = '/usr/lib/cgi-bin/panko'
$panko_wsgi_script_source = '/usr/share/panko-common/app.wsgi'
$panko_wsgi_script_source = '/usr/lib/python2.7/dist-packages/panko/api/app.wsgi'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")

48
spec/acceptance/basic_panko_spec.rb
View File

@ -17,39 +17,27 @@ describe 'basic panko' do
class { '::panko::keystone::auth':
password => 'a_big_secret',
}
case $::osfamily {
'Debian': {
warning('Panko is not yet packaged on Ubuntu systems.')
}
'RedHat': {
class { '::panko::logging':
debug => true,
}
include ::panko
class { '::panko::db':
database_connection => 'mysql+pymysql://panko:a_big_secret@127.0.0.1/panko?charset=utf8',
}
class { '::panko::keystone::authtoken':
password => 'a_big_secret',
}
class { '::panko::api':
enabled => true,
service_name => 'httpd',
sync_db => true,
}
include ::apache
class { '::panko::wsgi::apache':
ssl => false,
}
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
class { '::panko::logging':
debug => true,
}
include ::panko
class { '::panko::db':
database_connection => 'mysql+pymysql://panko:a_big_secret@127.0.0.1/panko?charset=utf8',
}
class { '::panko::keystone::authtoken':
password => 'a_big_secret',
}
class { '::panko::api':
enabled => true,
service_name => 'httpd',
sync_db => true,
}
include ::apache
class { '::panko::wsgi::apache':
ssl => false,
}
EOS
# Run it twice and test for idempotency
apply_manifest(pp, :catch_failures => true)
apply_manifest(pp, :catch_changes => true)

2
spec/classes/panko_wsgi_apache_spec.rb
View File

@ -93,7 +93,7 @@ describe 'panko::wsgi::apache' do
:httpd_service_name => 'apache2',
:httpd_ports_file => '/etc/apache2/ports.conf',
:wsgi_script_path => '/usr/lib/cgi-bin/panko',
:wsgi_script_source => '/usr/share/panko-common/app.wsgi'
:wsgi_script_source => '/usr/lib/python2.7/dist-packages/panko/api/app.wsgi'
}
when 'RedHat'
{