diff --git a/manifests/profile/base/apache.pp b/manifests/profile/base/apache.pp index b3ae1fffe..6cde9462a 100644 --- a/manifests/profile/base/apache.pp +++ b/manifests/profile/base/apache.pp @@ -32,9 +32,17 @@ class tripleo::profile::base::apache( Boolean $enable_status_listener = false, String $status_listener = '127.0.0.1:80', ) { + include ::apache::params + # rhel8/fedora will be python3. See LP#1813053 + if ($::os['name'] == 'Fedora') or ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { + class { '::apache': + mod_packages => merge($::apache::params::mod_packages, { 'wsgi' => 'python3-mod_wsgi' }), + mod_libs => merge($::apache::params::mod_libs, { 'wsgi' => 'mod_wsgi_python3.so' }), + } + } + include ::apache::mod::status include ::apache::mod::ssl - if $enable_status_listener { if !defined(Apache::Listen[$status_listener]) { ::apache::listen {$status_listener: } diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp index 307c7bb1f..838ff8cea 100644 --- a/manifests/profile/base/horizon.pp +++ b/manifests/profile/base/horizon.pp @@ -84,8 +84,8 @@ class tripleo::profile::base::horizon ( if $step >= 4 or ( $step >= 3 and $is_bootstrap ) { # Horizon - include ::apache::mod::remoteip include ::tripleo::profile::base::apache + include ::apache::mod::remoteip if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers', undef) { $_profile_support = 'cisco'