From 6d6fe62299391cc7b6c4661c60921b31e5ee3349 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 18 Apr 2018 13:57:53 +0200 Subject: [PATCH] Debian uses libapache2-mod-wsgi-py3 Since all of OpenStack in Debian switched to Python 3, we need to use libapache2-mod-wsgi-py3 instead of libapache2-mod-wsgi. This definition follows the upstream doc at: https://forge.puppet.com/puppetlabs/apache/readme (look at mod_packages). Change-Id: I841de2fe44c20419cb61fc1b3d0a77d38ce0c375 --- fixtures/scenario-aio.pp | 9 +++++++++ fixtures/scenario001.pp | 9 +++++++++ fixtures/scenario002.pp | 9 +++++++++ fixtures/scenario003.pp | 9 +++++++++ fixtures/scenario004.pp | 9 +++++++++ 5 files changed, 45 insertions(+) diff --git a/fixtures/scenario-aio.pp b/fixtures/scenario-aio.pp index 653b7b90e..4d3c6c111 100644 --- a/fixtures/scenario-aio.pp +++ b/fixtures/scenario-aio.pp @@ -14,6 +14,15 @@ # limitations under the License. # +if ($::os_package_type == 'debian') { + include ::apache::params + class { '::apache': + mod_packages => merge($::apache::params::mod_packages, { + 'wsgi' => 'libapache2-mod-wsgi-py3', + }) + } +} + include ::openstack_integration include ::openstack_integration::rabbitmq include ::openstack_integration::mysql diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index c4e121d15..6c3c0dc38 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -14,6 +14,15 @@ # limitations under the License. # +if ($::os_package_type == 'debian') { + include ::apache::params + class { '::apache': + mod_packages => merge($::apache::params::mod_packages, { + 'wsgi' => 'libapache2-mod-wsgi-py3', + }) + } +} + case $::osfamily { 'Debian': { $ipv6 = false diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index 54ca26e8f..3c0bdb201 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -14,6 +14,15 @@ # limitations under the License. # +if ($::os_package_type == 'debian') { + include ::apache::params + class { '::apache': + mod_packages => merge($::apache::params::mod_packages, { + 'wsgi' => 'libapache2-mod-wsgi-py3', + }) + } +} + case $::osfamily { 'Debian': { $ipv6 = false diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index 3234cf753..fcfe0311c 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -14,6 +14,15 @@ # limitations under the License. # +if ($::os_package_type == 'debian') { + include ::apache::params + class { '::apache': + mod_packages => merge($::apache::params::mod_packages, { + 'wsgi' => 'libapache2-mod-wsgi-py3', + }) + } +} + case $::osfamily { 'Debian': { $ipv6 = false diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index 2d25036e3..9dcd801cb 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -14,6 +14,15 @@ # limitations under the License. # +if ($::os_package_type == 'debian') { + include ::apache::params + class { '::apache': + mod_packages => merge($::apache::params::mod_packages, { + 'wsgi' => 'libapache2-mod-wsgi-py3', + }) + } +} + if $::operatingsystem == 'Ubuntu' { $ipv6 = false # Watcher packages are not available in Ubuntu repository.