openstack/puppet-nova
Code Issues Proposed changes

The service name for the Spice proxy is nova-spiceproxy under Ubuntu.

Browse Source 
Change-Id: I061be3d45ef463e9c192d6aea9b9059359c4214c
This commit is contained in:
Arnoud de Jonge
2014-10-30 13:34:39 +01:00
parent 648c9e8583
commit ee3d30098f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@@ -83,7 +83,6 @@ class nova::params {
$network_service_name = 'nova-network' $network_service_name = 'nova-network'
$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'
$vncproxy_service_name = 'nova-novncproxy' $vncproxy_service_name = 'nova-novncproxy'
$tgt_service_name = 'tgt' $tgt_service_name = 'tgt'
# debian specific nova config # debian specific nova config
@@ -92,12 +91,14 @@ class nova::params {
case $::operatingsystem { case $::operatingsystem {
'Debian': { 'Debian': {
$spicehtml5proxy_package_name = 'nova-consoleproxy' $spicehtml5proxy_package_name = 'nova-consoleproxy'
$spicehtml5proxy_service_name = 'nova-spicehtml5proxy'
$vncproxy_package_name = 'nova-consoleproxy' $vncproxy_package_name = 'nova-consoleproxy'
# 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'
$spicehtml5proxy_service_name = 'nova-spiceproxy'
$vncproxy_package_name = 'nova-novncproxy' $vncproxy_package_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'

2
spec/classes/nova_spicehtml5_proxy_spec.rb
View File

@@ -56,7 +56,7 @@ describe 'nova::spicehtml5proxy' do
let :platform_params do let :platform_params do
{ :spicehtml5proxy_package_name => 'nova-spiceproxy', { :spicehtml5proxy_package_name => 'nova-spiceproxy',
:spicehtml5proxy_service_name => 'nova-spicehtml5proxy' } :spicehtml5proxy_service_name => 'nova-spiceproxy' }
end end
it_configures 'nova-spicehtml5proxy' it_configures 'nova-spicehtml5proxy'