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
This commit is contained in:
parent
4164747aba
commit
709affe48d
|
@ -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'
|
||||
|
|
|
@ -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' }
|
||||
|
|
Loading…
Reference in New Issue