From 6d085be314895f16d4001e1473940217574f7834 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Sat, 28 Dec 2013 14:58:45 +0100
Subject: [PATCH] Horizon: Improvements

- Move the class to manifests/
- Update site.pp with new class name
- Update unit testing of Horizon

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/{dashboard/os_dashboard.pp => dashboard.pp} | 4 ++--
 site.pp                                               | 2 +-
 spec/classes/dashboard_spec.rb                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename manifests/{dashboard/os_dashboard.pp => dashboard.pp} (96%)

diff --git a/manifests/dashboard/os_dashboard.pp b/manifests/dashboard.pp
similarity index 96%
rename from manifests/dashboard/os_dashboard.pp
rename to manifests/dashboard.pp
index a8c5c438..85a3a696 100644
--- a/manifests/dashboard/os_dashboard.pp
+++ b/manifests/dashboard.pp
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# == Class: dashboard::os_dashboard
+# == Class: privatecloud::dashboard
 #
 # Installs the OpenStack Dashboard (Horizon)
 #
@@ -42,7 +42,7 @@
 #   Defaults false
 #
 
-class privatecloud::dashboard::os_dashboard(
+class privatecloud::dashboard(
   $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
   $secret_key                = $os_params::secret_key,
   $horizon_port              = $os_params::horizon_port,
diff --git a/site.pp b/site.pp
index 3be04d51..41bfbc4c 100644
--- a/site.pp
+++ b/site.pp
@@ -66,7 +66,7 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
     class {'os_sql_node':}
 
 ## Dashboard:
-    class {'privatecloud::dashboard::os_dashboard':}
+    class {'privatecloud::dashboard':}
 
 ## Telemetry
     class {'os_telemetry_common':}
diff --git a/spec/classes/dashboard_spec.rb b/spec/classes/dashboard_spec.rb
index 82edd34d..12784985 100644
--- a/spec/classes/dashboard_spec.rb
+++ b/spec/classes/dashboard_spec.rb
@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe 'privatecloud::dashboard::os_dashboard' do
+describe 'privatecloud::dashboard' do
 
   let :default_params do
     { :listen_ssl => false }