From 8843f476ea09e3d253a1fc3893934787aad095f3 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Tue, 2 Sep 2014 12:57:50 -0700
Subject: [PATCH] Fixed version detection

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
---
 manifests/application.pp | 2 +-
 manifests/params.pp      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/manifests/application.pp b/manifests/application.pp
index 15d0bdd..325871a 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -197,7 +197,7 @@ class storyboard::application (
   }
 
   # 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?
   if defined(Class['storyboard::cert']) {
diff --git a/manifests/params.pp b/manifests/params.pp
index 996548e..12fd0c8 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -25,7 +25,11 @@ class storyboard::params () {
 
   case $::osfamily {
     '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: {
       fail("Unsupported osfamily: ${::osfamily} The 'storyboard' module only supports osfamily Debian.")