openstack/puppet-nova
Code Issues Proposed changes

vnc: Clear vencrypt_* parameters by default

Browse Source 
... to make sure the unused parameters are removed from nova.conf.

Change-Id: I1e8527efe31f88334f3af53a427e5c4cf28ae885
This commit is contained in:
Takashi Kajinami
2022-04-04 17:39:42 +09:00
parent 079d6f48b6
commit 955836e129
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/vncproxy.pp
View File

@@ -100,6 +100,12 @@ class nova::vncproxy(
$auth_schemes = 'vencrypt' $auth_schemes = 'vencrypt'
} }
} else { } else {
nova_config {
'vnc/vencrypt_ca_certs': ensure => absent;
'vnc/vencrypt_client_cert': ensure => absent;
'vnc/vencrypt_client_key': ensure => absent;
}
$auth_schemes = 'none' $auth_schemes = 'none'
} }

26
spec/classes/nova_vnc_proxy_spec.rb
View File

@@ -13,10 +13,12 @@ describe 'nova::vncproxy' do
end end
context 'with default parameters' do context 'with default parameters' do
it { is_expected.to contain_nova_config('vnc/novncproxy_host').with_value('0.0.0.0') }
it { is_expected.to contain_nova_config('vnc/novncproxy_host').with(:value => '0.0.0.0') } it { is_expected.to contain_nova_config('vnc/novncproxy_port').with_value('6080') }
it { is_expected.to contain_nova_config('vnc/novncproxy_port').with(:value => '6080') } it { is_expected.to contain_nova_config('vnc/auth_schemes').with_value('none') }
it { is_expected.to contain_nova_config('vnc/auth_schemes').with(:value => 'none') } it { is_expected.to contain_nova_config('vnc/vencrypt_client_key').with_ensure('absent')}
it { is_expected.to contain_nova_config('vnc/vencrypt_client_cert').with_ensure('absent')}
it { is_expected.to contain_nova_config('vnc/vencrypt_ca_certs').with_ensure('absent')}
it { is_expected.to contain_package('nova-vncproxy').with( it { is_expected.to contain_package('nova-vncproxy').with(
:name => platform_params[:nova_vncproxy_package], :name => platform_params[:nova_vncproxy_package],
@@ -60,10 +62,10 @@ describe 'nova::vncproxy' do
:vencrypt_ca => '/baz.pem' :vencrypt_ca => '/baz.pem'
} }
end end
it { is_expected.to contain_nova_config('vnc/auth_schemes').with(:value => 'vencrypt,none') } it { is_expected.to contain_nova_config('vnc/auth_schemes').with_value('vencrypt,none') }
it { is_expected.to contain_nova_config('vnc/vencrypt_client_key').with(:value => '/foo.key')} it { is_expected.to contain_nova_config('vnc/vencrypt_client_key').with_value('/foo.key')}
it { is_expected.to contain_nova_config('vnc/vencrypt_client_cert').with(:value => '/bar.pem')} it { is_expected.to contain_nova_config('vnc/vencrypt_client_cert').with_value('/bar.pem')}
it { is_expected.to contain_nova_config('vnc/vencrypt_ca_certs').with(:value => '/baz.pem')} it { is_expected.to contain_nova_config('vnc/vencrypt_ca_certs').with_value('/baz.pem')}
end end
context 'with vencrypt without noauth' do context 'with vencrypt without noauth' do
@@ -76,10 +78,10 @@ describe 'nova::vncproxy' do
:vencrypt_ca => '/baz.pem' :vencrypt_ca => '/baz.pem'
} }
end end
it { is_expected.to contain_nova_config('vnc/auth_schemes').with(:value => 'vencrypt') } it { is_expected.to contain_nova_config('vnc/auth_schemes').with_value('vencrypt') }
it { is_expected.to contain_nova_config('vnc/vencrypt_client_key').with(:value => '/foo.key')} it { is_expected.to contain_nova_config('vnc/vencrypt_client_key').with_value('/foo.key')}
it { is_expected.to contain_nova_config('vnc/vencrypt_client_cert').with(:value => '/bar.pem')} it { is_expected.to contain_nova_config('vnc/vencrypt_client_cert').with_value('/bar.pem')}
it { is_expected.to contain_nova_config('vnc/vencrypt_ca_certs').with(:value => '/baz.pem')} it { is_expected.to contain_nova_config('vnc/vencrypt_ca_certs').with_value('/baz.pem')}
end end
context 'with no auth method set' do context 'with no auth method set' do