From 0f02bab8b644667f4f2cc8d657babd803bb6f044 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 26 Apr 2025 23:53:42 +0900 Subject: [PATCH] Purge [vnc] novncproxy_base_url by default ... to avoid leaving an unmanaged value. Change-Id: I9d2c3feaca241959fec6b20a386542e91c280e6a --- manifests/vncproxy/common.pp | 4 ++++ spec/classes/nova_compute_spec.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/vncproxy/common.pp b/manifests/vncproxy/common.pp index 6aa33f74b..842a9cb66 100644 --- a/manifests/vncproxy/common.pp +++ b/manifests/vncproxy/common.pp @@ -103,5 +103,9 @@ class nova::vncproxy::common ( nova_config { 'vnc/novncproxy_base_url': value => $vncproxy_base_url; } + } else { + nova_config { + 'vnc/novncproxy_base_url': value => $facts['os_service_default']; + } } } diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb index 52142e1cf..93c1d0b8f 100644 --- a/spec/classes/nova_compute_spec.rb +++ b/spec/classes/nova_compute_spec.rb @@ -26,8 +26,8 @@ describe 'nova::compute' do it 'does not configure vncproxy base url in nova.conf' do is_expected.to contain_nova_config('vnc/enabled').with_value(true) - is_expected.to_not contain_nova_config('vnc/novncproxy_base_url') is_expected.to contain_nova_config('vnc/server_proxyclient_address').with_value('') + is_expected.to contain_nova_config('vnc/novncproxy_base_url').with_value('') end it 'should have spice disabled' do