From 709affe48d31ec077fe819ee863dcd33dcb206d1 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 19 Feb 2019 10:41:28 +0100 Subject: [PATCH] Debian: Fix Nova serial proxy package name In Debian, the nova-serialproxy service is packaged together with the other proxy services in a nova-consoleproxy package. This patch fixes this issue. Change-Id: Ib629a4fd15ec5236ba9b2b216c9cfd70a350e757 --- manifests/params.pp | 3 ++- spec/classes/nova_serial_proxy_spec.rb | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index b57e30b19..613c86a94 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -102,7 +102,6 @@ class nova::params { $network_package_name = 'nova-network' $scheduler_package_name = 'nova-scheduler' $tgt_package_name = 'tgt' - $serialproxy_package_name = 'nova-serialproxy' $ceph_client_package_name = 'ceph' $genisoimage_package_name = 'genisoimage' # service names @@ -129,6 +128,7 @@ class nova::params { $spicehtml5proxy_package_name = 'nova-consoleproxy' $spicehtml5proxy_service_name = 'nova-spicehtml5proxy' $vncproxy_package_name = 'nova-consoleproxy' + $serialproxy_package_name = 'nova-consoleproxy' # Use default provider on Debian $special_service_provider = undef $virtlock_service_name = undef @@ -142,6 +142,7 @@ class nova::params { $spicehtml5proxy_package_name = 'nova-spiceproxy' $spicehtml5proxy_service_name = 'nova-spiceproxy' $vncproxy_package_name = 'nova-novncproxy' + $serialproxy_package_name = 'nova-serialproxy' # Use default provider on Debian $special_service_provider = undef $virtlock_service_name = 'virtlockd' diff --git a/spec/classes/nova_serial_proxy_spec.rb b/spec/classes/nova_serial_proxy_spec.rb index ced6be493..ab8c1ffbc 100644 --- a/spec/classes/nova_serial_proxy_spec.rb +++ b/spec/classes/nova_serial_proxy_spec.rb @@ -59,8 +59,13 @@ describe 'nova::serialproxy' do let (:platform_params) do case facts[:osfamily] when 'Debian' - { :serialproxy_package_name => 'nova-serialproxy', - :serialproxy_service_name => 'nova-serialproxy' } + if facts[:os_package_type] == 'debian' + { :serialproxy_package_name => 'nova-consoleproxy', + :serialproxy_service_name => 'nova-serialproxy' } + else + { :serialproxy_package_name => 'nova-serialproxy', + :serialproxy_service_name => 'nova-serialproxy' } + end when 'RedHat' { :serialproxy_package_name => 'openstack-nova-serialproxy', :serialproxy_service_name => 'openstack-nova-serialproxy' }