From ee3d30098fff4e7fb7acb0938d0bf0547f5c33b3 Mon Sep 17 00:00:00 2001
From: Arnoud de Jonge <arnoud.dejonge@cyso.com>
Date: Thu, 30 Oct 2014 13:34:39 +0100
Subject: [PATCH] The service name for the Spice proxy is nova-spiceproxy under
 Ubuntu.

Change-Id: I061be3d45ef463e9c192d6aea9b9059359c4214c
---
 manifests/params.pp                        | 3 ++-
 spec/classes/nova_spicehtml5_proxy_spec.rb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index e5255e181..5d0fb5130 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -83,7 +83,6 @@ class nova::params {
       $network_service_name         = 'nova-network'
       $objectstore_service_name     = 'nova-objectstore'
       $scheduler_service_name       = 'nova-scheduler'
-      $spicehtml5proxy_service_name = 'nova-spicehtml5proxy'
       $vncproxy_service_name        = 'nova-novncproxy'
       $tgt_service_name             = 'tgt'
       # debian specific nova config
@@ -92,12 +91,14 @@ class nova::params {
       case $::operatingsystem {
         'Debian': {
           $spicehtml5proxy_package_name = 'nova-consoleproxy'
+          $spicehtml5proxy_service_name = 'nova-spicehtml5proxy'
           $vncproxy_package_name    = 'nova-consoleproxy'
           # Use default provider on Debian
           $special_service_provider = undef
         }
         default: {
           $spicehtml5proxy_package_name = 'nova-spiceproxy'
+          $spicehtml5proxy_service_name = 'nova-spiceproxy'
           $vncproxy_package_name    = 'nova-novncproxy'
           # some of the services need to be started form the special upstart provider
           $special_service_provider = 'upstart'
diff --git a/spec/classes/nova_spicehtml5_proxy_spec.rb b/spec/classes/nova_spicehtml5_proxy_spec.rb
index 88f38ceb4..529ee0ebd 100644
--- a/spec/classes/nova_spicehtml5_proxy_spec.rb
+++ b/spec/classes/nova_spicehtml5_proxy_spec.rb
@@ -56,7 +56,7 @@ describe 'nova::spicehtml5proxy' do
 
     let :platform_params do
       { :spicehtml5proxy_package_name => 'nova-spiceproxy',
-        :spicehtml5proxy_service_name => 'nova-spicehtml5proxy' }
+        :spicehtml5proxy_service_name => 'nova-spiceproxy' }
     end
 
     it_configures 'nova-spicehtml5proxy'