openstack/puppet-nova
Code Issues Proposed changes

Merge "Support array value for console_ssl_ciphers"

Browse Source
This commit is contained in:
Zuul
2022-11-29 18:49:29 +00:00
committed by Gerrit Code Review
parent fa343cb9a9 6d566d2d40
commit 604905e8ad
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@@ -564,7 +564,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
'DEFAULT/ssl_only': value => $ssl_only; 'DEFAULT/ssl_only': value => $ssl_only;
'DEFAULT/cert': value => $cert; 'DEFAULT/cert': value => $cert;
'DEFAULT/key': value => $key; 'DEFAULT/key': value => $key;
'console/ssl_ciphers': value => $console_ssl_ciphers; 'console/ssl_ciphers': value => join(any2array($console_ssl_ciphers), ':');
'console/ssl_minimum_version': value => $console_ssl_minimum_version; 'console/ssl_minimum_version': value => $console_ssl_minimum_version;
'DEFAULT/my_ip': value => $my_ip; 'DEFAULT/my_ip': value => $my_ip;
'DEFAULT/host': value => $host; 'DEFAULT/host': value => $host;

8
spec/classes/nova_init_spec.rb
View File

@@ -470,6 +470,14 @@ describe 'nova' do
it { is_expected.to contain_nova_config('DEFAULT/initial_disk_allocation_ratio').with_value(3.0) } it { is_expected.to contain_nova_config('DEFAULT/initial_disk_allocation_ratio').with_value(3.0) }
end end
context 'with array used for console_ssl_ciphers' do
let :params do
{
:console_ssl_ciphers => ['kEECDH+aECDSA+AES', 'kEECDH+AES+aRSA', 'kEDH+aRSA+AES']
}
end
it {is_expected.to contain_nova_config('console/ssl_ciphers').with_value('kEECDH+aECDSA+AES:kEECDH+AES+aRSA:kEDH+aRSA+AES') }
end
end end