openstack/puppet-nova
Code Issues Proposed changes

Add missing params in nova.conf for SSL

Browse Source 
SSL params also need to be in [DEFAULT] section otherwise Nova API
service won't start.

Change-Id: I342fadc1062f7a8d6efef443715e327f4c00a2e1
This commit is contained in:
Emilien Macchi
2016-03-02 21:38:28 -05:00
parent ab37a2bdcd
commit 765111faaf
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

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

3
spec/classes/nova_init_spec.rb
View File

@@ -485,6 +485,9 @@ describe 'nova' do
it { is_expected.to contain_nova_config('ssl/ca_file').with_value('/path/to/ca') }
it { is_expected.to contain_nova_config('ssl/cert_file').with_value('/path/to/cert') }
it { is_expected.to contain_nova_config('ssl/key_file').with_value('/path/to/key') }
it { is_expected.to contain_nova_config('DEFAULT/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('DEFAULT/ssl_key_file').with_value('/path/to/key') }
end
context 'with SSL socket options set with wrong parameters' do