Fix vncproxy package/service name on Debian

This commit fix vncproxy on debian os, we have now a duplicate
between nova::vncproxy and nova::spicehtml5proxy packages on debian
but install both have no sense…

Closes-bug: #1267645

Change-Id: Ib0a769ba91221d1ebc14df01f24579c8fe58db26
This commit is contained in:
Sebastien Badia
2014-01-10 00:55:19 +01:00
parent 9e19c3179b
commit c5eb65b0ad
2 changed files with 4 additions and 5 deletions

View File

@@ -77,6 +77,7 @@ class nova::params {
$objectstore_service_name = 'nova-objectstore' $objectstore_service_name = 'nova-objectstore'
$scheduler_service_name = 'nova-scheduler' $scheduler_service_name = 'nova-scheduler'
$spicehtml5proxy_service_name = 'nova-spicehtml5proxy' $spicehtml5proxy_service_name = 'nova-spicehtml5proxy'
$vncproxy_service_name = 'nova-novncproxy'
$tgt_service_name = 'tgt' $tgt_service_name = 'tgt'
# debian specific nova config # debian specific nova config
$root_helper = 'sudo nova-rootwrap' $root_helper = 'sudo nova-rootwrap'
@@ -84,15 +85,13 @@ class nova::params {
case $::operatingsystem { case $::operatingsystem {
'Debian': { 'Debian': {
$spicehtml5proxy_package_name = 'nova-consoleproxy' $spicehtml5proxy_package_name = 'nova-consoleproxy'
$vncproxy_package_name = 'novnc' $vncproxy_package_name = 'nova-consoleproxy'
$vncproxy_service_name = 'novnc'
# Use default provider on Debian # Use default provider on Debian
$special_service_provider = undef $special_service_provider = undef
} }
default: { default: {
$spicehtml5proxy_package_name = 'nova-spiceproxy' $spicehtml5proxy_package_name = 'nova-spiceproxy'
$vncproxy_package_name = 'nova-novncproxy' $vncproxy_package_name = 'nova-novncproxy'
$vncproxy_service_name = 'nova-novncproxy'
# some of the services need to be started form the special upstart provider # some of the services need to be started form the special upstart provider
$special_service_provider = 'upstart' $special_service_provider = 'upstart'
} }

View File

@@ -49,11 +49,11 @@ describe 'nova::vncproxy' do
{ :osfamily => 'Debian', :operatingsystem => 'Debian' } { :osfamily => 'Debian', :operatingsystem => 'Debian' }
end end
it { should contain_package('nova-vncproxy').with( it { should contain_package('nova-vncproxy').with(
:name => "novnc", :name => "nova-consoleproxy",
:ensure => 'present' :ensure => 'present'
)} )}
it { should contain_service('nova-vncproxy').with( it { should contain_service('nova-vncproxy').with(
:name => 'novnc', :name => 'nova-novncproxy',
:hasstatus => true, :hasstatus => true,
:ensure => 'running' :ensure => 'running'
)} )}