Browse Source

Merge "Use python3 mod_wsgi when running in fedora"

Zuul 6 months ago
parent
commit
01b2b95aa0

+ 15
- 2
packstack/puppet/modules/packstack/manifests/apache.pp View File

@@ -1,7 +1,20 @@
1 1
 class packstack::apache ()
2 2
 {
3
-    class {'::apache':
4
-      purge_configs => false,
3
+    # Use python3 for mod_wsg in fedora
4
+    if ($::operatingsystem == 'Fedora') or ($::osfamily == 'RedHat' and Integer.new($::operatingsystemmajrelease) > 7)  {
5
+      class { '::apache':
6
+        purge_configs => false,
7
+        mod_packages => merge($::apache::params::mod_packages, {
8
+          'wsgi' => 'python3-mod_wsgi',
9
+        }),
10
+        mod_libs     => merge($::apache::params::mod_libs, {
11
+          'wsgi' => 'mod_wsgi_python3.so',
12
+        })
13
+      }
14
+    }else{
15
+      class {'::apache':
16
+        purge_configs => false,
17
+      }
5 18
     }
6 19
 
7 20
     if hiera('CONFIG_HORIZON_SSL')  == 'y' {

+ 2
- 5
packstack/puppet/modules/packstack/manifests/prereqs.pp View File

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

Loading…
Cancel
Save