openstack/puppet-heat
Code Issues Proposed changes

Merge "aph/api_cfn: Clear the related parameters when ssl is disabled"

Browse Source
This commit is contained in:
Zuul
2021-11-12 12:21:25 +00:00
committed by Gerrit Code Review
parent 3703f8805a 8645f8d70c
commit 93d2d31f07
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/api.pp
View File

@@ -133,5 +133,10 @@ running as a standalone service, or httpd for being run by a httpd server")
'heat_api/cert_file': value => $cert_file;
'heat_api/key_file': value => $key_file;
}
} else {
heat_config {
'heat_api/cert_file': value => $::os_service_default;
'heat_api/key_file': value => $::os_service_default;
}
}
}

5
manifests/api_cfn.pp
View File

@@ -136,6 +136,11 @@ running as a standalone service, or httpd for being run by a httpd server")
'heat_api_cfn/cert_file': value => $cert_file;
'heat_api_cfn/key_file': value => $key_file;
}
} else {
heat_config {
'heat_api_cfn/cert_file': value => $::os_service_default;
'heat_api_cfn/key_file': value => $::os_service_default;
}
}
}

2
spec/classes/heat_api_cfn_spec.rb
View File

@@ -27,6 +27,8 @@ describe 'heat::api_cfn' do
it { is_expected.to contain_heat_config('heat_api_cfn/bind_port').with_value( params[:bind_port] ) }
it { is_expected.to contain_heat_config('heat_api_cfn/workers').with_value( params[:workers] ) }
it { is_expected.to contain_heat_config('heat_api_cfn/cert_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_heat_config('heat_api_cfn/key_file').with_value('<SERVICE DEFAULT>') }
end
context 'with SSL socket options set' do

2
spec/classes/heat_api_spec.rb
View File

@@ -27,6 +27,8 @@ describe 'heat::api' do
it { is_expected.to contain_heat_config('heat_api/bind_port').with_value( params[:bind_port] ) }
it { is_expected.to contain_heat_config('heat_api/workers').with_value( params[:workers] ) }
it { is_expected.to contain_heat_config('heat_api/cert_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_heat_config('heat_api/key_file').with_value('<SERVICE DEFAULT>') }
end
context 'with SSL socket options set' do