From 627da245dd6c1a4250cad3dbe8a39d710cfff8e9 Mon Sep 17 00:00:00 2001 From: Arnoud de Jonge Date: Wed, 19 Nov 2014 14:32:12 +0100 Subject: [PATCH] Moved spice configuration options from DEFAULT to spice section. 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 --- manifests/spicehtml5proxy.pp | 6 ++++-- spec/classes/nova_spicehtml5_proxy_spec.rb | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/manifests/spicehtml5proxy.pp b/manifests/spicehtml5proxy.pp index 0994ba3d9..4a4ab51cb 100644 --- a/manifests/spicehtml5proxy.pp +++ b/manifests/spicehtml5proxy.pp @@ -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': diff --git a/spec/classes/nova_spicehtml5_proxy_spec.rb b/spec/classes/nova_spicehtml5_proxy_spec.rb index 8e4dca597..4828be3ea 100644 --- a/spec/classes/nova_spicehtml5_proxy_spec.rb +++ b/spec/classes/nova_spicehtml5_proxy_spec.rb @@ -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(