opendev/puppet-storyboard
Code Issues Proposed changes

Fixed version detection

Browse Source 
Version detection for apache was incorrectly based off a version
of the apache module that isn't in use by openstack. Rather than
creating a weird dependency issue, I've moved the apache default
version detection into the storyboard module directly.

Change-Id: Ib4be592207bd43abb0c97417f321a2ffa26465f1
This commit is contained in:
Michael Krotscheck 2014-09-02 12:57:50 -07:00
parent cd3f27298d
commit 8843f476ea
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/application.pp
View File

@ -197,7 +197,7 @@ class storyboard::application (
} }
# Check vhost permission set. # Check vhost permission set.
$new_vhost_perms = (versioncmp($::apache::apache_version, '2.4') >= 0) $new_vhost_perms = (versioncmp($::storyboard::params::apache_version, '2.4') >= 0)
# Are we setting up TLS or non-TLS? # Are we setting up TLS or non-TLS?
if defined(Class['storyboard::cert']) { if defined(Class['storyboard::cert']) {

6
manifests/params.pp
View File

@ -25,7 +25,11 @@ class storyboard::params () {
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
# Do nothing, since all the defaults are debian-specific. if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
$apache_version = '2.4'
} else {
$apache_version = '2.2'
}
} }
default: { default: {
fail("Unsupported osfamily: ${::osfamily} The 'storyboard' module only supports osfamily Debian.") fail("Unsupported osfamily: ${::osfamily} The 'storyboard' module only supports osfamily Debian.")