diff --git a/packstack/puppet/modules/packstack/manifests/apache.pp b/packstack/puppet/modules/packstack/manifests/apache.pp index f97458137..5b21126aa 100644 --- a/packstack/puppet/modules/packstack/manifests/apache.pp +++ b/packstack/puppet/modules/packstack/manifests/apache.pp @@ -1,7 +1,20 @@ class packstack::apache () { - class {'::apache': - purge_configs => false, + # Use python3 for mod_wsg in fedora + 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' { diff --git a/packstack/puppet/modules/packstack/manifests/prereqs.pp b/packstack/puppet/modules/packstack/manifests/prereqs.pp index 7efc4d08d..9a1dd9164 100644 --- a/packstack/puppet/modules/packstack/manifests/prereqs.pp +++ b/packstack/puppet/modules/packstack/manifests/prereqs.pp @@ -1,10 +1,7 @@ class packstack::prereqs () { - # We don't have openstack-selinux package for Fedora - if $::operatingsystem != 'Fedora' { - package{ 'openstack-selinux': - ensure => present, - } + package{ 'openstack-selinux': + ensure => present, } package { 'sos':