openstack/puppet-nova
Code Issues Proposed changes

Merge "Join enabled_ssl_apis array"

Browse Source
This commit is contained in:
Jenkins
2014-09-09 18:56:30 +00:00
committed by Gerrit Code Review
parent a050b2c36e 816fe4a78a
commit d5e18c4906
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@@ -638,7 +638,7 @@ class nova(
# SSL Options # SSL Options
if $use_ssl { if $use_ssl {
nova_config { nova_config {
'DEFAULT/enabled_ssl_apis' : value => $enabled_ssl_apis; 'DEFAULT/enabled_ssl_apis' : value => join($enabled_ssl_apis, ',');
'DEFAULT/ssl_cert_file' : value => $cert_file; 'DEFAULT/ssl_cert_file' : value => $cert_file;
'DEFAULT/ssl_key_file' : value => $key_file; 'DEFAULT/ssl_key_file' : value => $key_file;
} }

4
spec/classes/nova_init_spec.rb
View File

@@ -567,14 +567,14 @@ describe 'nova' do
let :params do let :params do
{ {
:use_ssl => true, :use_ssl => true,
:enabled_ssl_apis => ['ec2'], :enabled_ssl_apis => ['ec2', 'osapi_compute'],
:cert_file => '/path/to/cert', :cert_file => '/path/to/cert',
:ca_file => '/path/to/ca', :ca_file => '/path/to/ca',
:key_file => '/path/to/key', :key_file => '/path/to/key',
} }
end end
it { should contain_nova_config('DEFAULT/enabled_ssl_apis').with_value(['ec2']) } it { should contain_nova_config('DEFAULT/enabled_ssl_apis').with_value('ec2,osapi_compute') }
it { should contain_nova_config('DEFAULT/ssl_ca_file').with_value('/path/to/ca') } it { should contain_nova_config('DEFAULT/ssl_ca_file').with_value('/path/to/ca') }
it { should contain_nova_config('DEFAULT/ssl_cert_file').with_value('/path/to/cert') } it { should contain_nova_config('DEFAULT/ssl_cert_file').with_value('/path/to/cert') }
it { should contain_nova_config('DEFAULT/ssl_key_file').with_value('/path/to/key') } it { should contain_nova_config('DEFAULT/ssl_key_file').with_value('/path/to/key') }