openstack/puppet-nova
Code Issues Proposed changes

Merge "Change SSL options to [ssl] section."

Browse Source
This commit is contained in:
Jenkins
2016-01-14 05:53:06 +00:00
committed by Gerrit Code Review
parent f208f5c953 fdf5875be4
commit 93edb8b199
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@@ -615,24 +615,24 @@ class nova(
if $use_ssl { if $use_ssl {
nova_config { nova_config {
'DEFAULT/enabled_ssl_apis' : value => join($enabled_ssl_apis, ','); 'DEFAULT/enabled_ssl_apis' : value => join($enabled_ssl_apis, ',');
'DEFAULT/ssl_cert_file' : value => $cert_file; 'ssl/cert_file' : value => $cert_file;
'DEFAULT/ssl_key_file' : value => $key_file; 'ssl/key_file' : value => $key_file;
} }
if $ca_file { if $ca_file {
nova_config { 'DEFAULT/ssl_ca_file' : nova_config { 'ssl/ca_file' :
value => $ca_file, value => $ca_file,
} }
} else { } else {
nova_config { 'DEFAULT/ssl_ca_file' : nova_config { 'ssl/ca_file' :
ensure => absent, ensure => absent,
} }
} }
} else { } else {
nova_config { nova_config {
'DEFAULT/enabled_ssl_apis' : ensure => absent; 'DEFAULT/enabled_ssl_apis' : ensure => absent;
'DEFAULT/ssl_cert_file' : ensure => absent; 'ssl/cert_file' : ensure => absent;
'DEFAULT/ssl_key_file' : ensure => absent; 'ssl/key_file' : ensure => absent;
'DEFAULT/ssl_ca_file' : ensure => absent; 'ssl/ca_file' : ensure => absent;
} }
} }

12
spec/classes/nova_init_spec.rb
View File

@@ -472,9 +472,9 @@ describe 'nova' do
end end
it { is_expected.to contain_nova_config('DEFAULT/enabled_ssl_apis').with_value('osapi_compute') } it { is_expected.to contain_nova_config('DEFAULT/enabled_ssl_apis').with_value('osapi_compute') }
it { is_expected.to contain_nova_config('DEFAULT/ssl_ca_file').with_value('/path/to/ca') } it { is_expected.to contain_nova_config('ssl/ca_file').with_value('/path/to/ca') }
it { is_expected.to contain_nova_config('DEFAULT/ssl_cert_file').with_value('/path/to/cert') } it { is_expected.to contain_nova_config('ssl/cert_file').with_value('/path/to/cert') }
it { is_expected.to contain_nova_config('DEFAULT/ssl_key_file').with_value('/path/to/key') } it { is_expected.to contain_nova_config('ssl/key_file').with_value('/path/to/key') }
end end
context 'with SSL socket options set with wrong parameters' do context 'with SSL socket options set with wrong parameters' do
@@ -502,9 +502,9 @@ describe 'nova' do
end end
it { is_expected.to contain_nova_config('DEFAULT/enabled_ssl_apis').with_ensure('absent') } it { is_expected.to contain_nova_config('DEFAULT/enabled_ssl_apis').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/ssl_ca_file').with_ensure('absent') } it { is_expected.to contain_nova_config('ssl/ca_file').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/ssl_cert_file').with_ensure('absent') } it { is_expected.to contain_nova_config('ssl/cert_file').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/ssl_key_file').with_ensure('absent') } it { is_expected.to contain_nova_config('ssl/key_file').with_ensure('absent') }
end end
end end