x
/
packstack
Code Issues Proposed changes

Merge "Use python3 mod_wsgi when running in fedora"

This commit is contained in:
Zuul 2018-10-03 17:25:59 +00:00 committed by Gerrit Code Review
parent 60066aca35 60a5d78b14
commit 01b2b95aa0
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packstack/puppet/modules/packstack/manifests/apache.pp
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' {

7
packstack/puppet/modules/packstack/manifests/prereqs.pp
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':