From b28613295aaa415acfa1f56ed74c870a445432f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri.lebouder@enovance.com>
Date: Sun, 19 Jan 2014 20:43:25 +0100
Subject: [PATCH] adjust for horizon wsgi changes

puppet-horizon has now some wsgi_ parameters and the Debian
situation is resolved.
---
 manifests/dashboard.pp | 47 ++++++++++++------------------------------
 1 file changed, 13 insertions(+), 34 deletions(-)

diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
index 1fb0795b..a31cbe59 100644
--- a/manifests/dashboard.pp
+++ b/manifests/dashboard.pp
@@ -50,40 +50,19 @@ class cloud::dashboard(
   $listen_ssl                = false,
 ) {
 
-  case $::osfamily {
-    'RedHat': {
-      class {'horizon':
-        secret_key          => $secret_key,
-        keystone_host       => $ks_keystone_internal_host,
-        can_set_mount_point => 'False',
-        # fqdn can can be ambiguous since we use reverse DNS here,
-        # e.g: 127.0.0.1 instead of a public IP address.
-        # We force $api_eth to avoid this situation
-        fqdn                => $api_eth
-      }
-    }
-    'Debian': {
-      case $::operatingsystem {
-        'Debian': {
-          #FIXME(sbadia) https://review.openstack.org/#/c/64523/
-          fail('puppet-horizon does not work yet on Debian. Work in progress by https://review.openstack.org/#/c/64523/')
-        }
-        default: {
-          class {'horizon':
-            secret_key          => $secret_key,
-            keystone_host       => $ks_keystone_internal_host,
-            can_set_mount_point => 'False',
-            # fqdn can can be ambiguous since we use reverse DNS here,
-            # e.g: 127.0.0.1 instead of a public IP address.
-            # We force $api_eth to avoid this situation
-            fqdn                => $api_eth
-          }
-        }
-      }
-    }
-    default: {
-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module puppet-horizon only support osfamily RedHat and Debian")
-    }
+  $supported = [ 'RedHat', 'Debian' ]
+  if grep($supported, $::osfamily) != [$::osfamily] {
+    fail("module puppet-horizon doesn't support ${::osfamily}")
+  }
+
+  class {'horizon':
+    secret_key          => $secret_key,
+    keystone_host       => $ks_keystone_internal_host,
+    can_set_mount_point => 'False',
+# fqdn can can be ambiguous since we use reverse DNS here,
+# e.g: 127.0.0.1 instead of a public IP address.
+# We force $api_eth to avoid this situation
+    fqdn                => $api_eth,
   }
 
   @@haproxy::balancermember{"${::fqdn}-horizon":