openstack/puppet-openstack-integration
Code Issues Proposed changes

Debian uses libapache2-mod-wsgi-py3

Browse Source 
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
This commit is contained in:
Thomas Goirand 2018-04-18 13:57:53 +02:00
parent a45fae3c03
commit 6d6fe62299
5 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fixtures/scenario-aio.pp
View File

@ -14,6 +14,15 @@
# limitations under the License. # 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
include ::openstack_integration::rabbitmq include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql include ::openstack_integration::mysql

9
fixtures/scenario001.pp
View File

@ -14,6 +14,15 @@
# limitations under the License. # 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 { case $::osfamily {
'Debian': { 'Debian': {
$ipv6 = false $ipv6 = false

9
fixtures/scenario002.pp
View File

@ -14,6 +14,15 @@
# limitations under the License. # 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 { case $::osfamily {
'Debian': { 'Debian': {
$ipv6 = false $ipv6 = false

9
fixtures/scenario003.pp
View File

@ -14,6 +14,15 @@
# limitations under the License. # 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 { case $::osfamily {
'Debian': { 'Debian': {
$ipv6 = false $ipv6 = false

9
fixtures/scenario004.pp
View File

@ -14,6 +14,15 @@
# limitations under the License. # 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' { if $::operatingsystem == 'Ubuntu' {
$ipv6 = false $ipv6 = false
# Watcher packages are not available in Ubuntu repository. # Watcher packages are not available in Ubuntu repository.