Use python3 mod_wsgi when running in fedora

This is part of the preparation to run in python3 environments.

Additionally, this patch removes exception for fedora to install
openstack-selinux in all systems.

Change-Id: I8e8a65765bf29bc1a22809fcaba29985c60636f2
This commit is contained in:
Alfredo Moralejo 2018-09-28 16:04:14 +02:00
parent e2c31de9b3
commit 60a5d78b14
2 changed files with 17 additions and 7 deletions

View File

@ -1,7 +1,20 @@
class packstack::apache () class packstack::apache ()
{ {
class {'::apache': # Use python3 for mod_wsg in fedora
purge_configs => false, if ($::operatingsystem == 'Fedora') or ($::osfamily == 'RedHat' and Integer.new($::operatingsystemmajrelease) > 7) {
class { '::apache':
purge_configs => false,
mod_packages => merge($::apache::params::mod_packages, {
'wsgi' => 'python3-mod_wsgi',
}),
mod_libs => merge($::apache::params::mod_libs, {
'wsgi' => 'mod_wsgi_python3.so',
})
}
}else{
class {'::apache':
purge_configs => false,
}
} }
if hiera('CONFIG_HORIZON_SSL') == 'y' { if hiera('CONFIG_HORIZON_SSL') == 'y' {

View File

@ -1,10 +1,7 @@
class packstack::prereqs () class packstack::prereqs ()
{ {
# We don't have openstack-selinux package for Fedora package{ 'openstack-selinux':
if $::operatingsystem != 'Fedora' { ensure => present,
package{ 'openstack-selinux':
ensure => present,
}
} }
package { 'sos': package { 'sos':