openstack/puppet-openstack-integration
Code Issues Proposed changes

Make sure libapache2-mod-wsgi-py3 is used for Ubuntu

Browse Source 
Forgot to change the second if statement, this is
required to make sure mod_wsgi py2 is not installed
which overwrites the py3 version and makes thing fail.

Change-Id: If406d07d5f204c4b04bd3b85e76e03fc55af8536
This commit is contained in:
Tobias Urdin 2019-02-04 16:14:44 +01:00
parent 4f0e3ee81e
commit 4159e236d9
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixtures/scenario-py3.pp
View File

@ -23,7 +23,7 @@ elsif ($::os['name'] == 'Fedora') or
$wsgi_mod_package = 'python3-mod_wsgi'
$wsgi_mod_lib = 'mod_wsgi_python3.so'
}
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
include ::apache::params
class { '::apache':

2
fixtures/scenario001.pp
View File

@ -23,7 +23,7 @@ elsif ($::os['name'] == 'Fedora') or
$wsgi_mod_package = 'python3-mod_wsgi'
$wsgi_mod_lib = 'mod_wsgi_python3.so'
}
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
include ::apache::params
class { '::apache':

2
fixtures/scenario002.pp
View File

@ -23,7 +23,7 @@ elsif ($::os['name'] == 'Fedora') or
$wsgi_mod_package = 'python3-mod_wsgi'
$wsgi_mod_lib = 'mod_wsgi_python3.so'
}
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
include ::apache::params
class { '::apache':

2
fixtures/scenario003.pp
View File

@ -23,7 +23,7 @@ elsif ($::os['name'] == 'Fedora') or
$wsgi_mod_package = 'python3-mod_wsgi'
$wsgi_mod_lib = 'mod_wsgi_python3.so'
}
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
include ::apache::params
class { '::apache':

2
fixtures/scenario004.pp
View File

@ -23,7 +23,7 @@ elsif ($::os['name'] == 'Fedora') or
$wsgi_mod_package = 'python3-mod_wsgi'
$wsgi_mod_lib = 'mod_wsgi_python3.so'
}
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
include ::apache::params
class { '::apache':