openstack/puppet-nova
Code Issues Proposed changes

Moved spice configuration options from DEFAULT to spice section.

Browse Source 
Configuration for spice now has a seperate section in nova.conf, moved
DEFAULT/spicehtml5proxy_host and DEFAULT/spicehtml5proxy_port to
spice/html5proxy_host and spice/html5proxy_port. Added spice/enabled and
spice/agent_enabled.

See also:
http://docs.openstack.org/admin-guide-cloud/content/spice-console.html
https://bugs.launchpad.net/openstack-manuals/+bug/1394595

Change-Id: If758377245fe5b8e06c3ee1afb0595beb90a5038
This commit is contained in:
Arnoud de Jonge 2014-11-19 14:32:12 +01:00
parent 2aa85630db
commit 627da245dd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/spicehtml5proxy.pp
View File

@ -39,8 +39,10 @@ class nova::spicehtml5proxy(
include ::nova::params
nova_config {
'DEFAULT/spicehtml5proxy_host': value => $host;
'DEFAULT/spicehtml5proxy_port': value => $port;
'spice/enabled': value => $enabled;
'spice/agent_enabled': value => $enabled;
'spice/html5proxy_host': value => $host;
'spice/html5proxy_port': value => $port;
}
nova::generic_service { 'spicehtml5proxy':

4
spec/classes/nova_spicehtml5_proxy_spec.rb
View File

@ -13,8 +13,8 @@ describe 'nova::spicehtml5proxy' do
shared_examples 'nova-spicehtml5proxy' do
it 'configures nova.conf' do
is_expected.to contain_nova_config('DEFAULT/spicehtml5proxy_host').with(:value => '0.0.0.0')
is_expected.to contain_nova_config('DEFAULT/spicehtml5proxy_port').with(:value => '6082')
is_expected.to contain_nova_config('spice/html5proxy_host').with(:value => '0.0.0.0')
is_expected.to contain_nova_config('spice/html5proxy_port').with(:value => '6082')
end
it { is_expected.to contain_package('nova-spicehtml5proxy').with(