openstack
/
puppet-ec2api
Code Issues Proposed changes

Replace deprecated [DEFAULT] ssl_* parameters 

The ssl_* parameters in the [DEFAULT] sections were deprecated and
the [ssl] parameters should be used instead[1].

[1] 2e2940d1e17706b9d6367ff1783bde9d41891bfa

Change-Id: If5ee27626b778bda4d8cb47162691f3cced35955
This commit is contained in:
Takashi Kajinami 2022-04-07 11:19:04 +09:00
parent a72e6fe949
commit e3f44b4ef5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/api.pp
View File

@ -295,9 +295,9 @@ class ec2api::api (
'DEFAULT/ec2api_workers': value => $ec2api_workers;
'DEFAULT/service_down_time': value => $service_down_time;
'DEFAULT/api_paste_config': value => $api_paste_config;
'DEFAULT/ssl_ca_file': value => $ssl_ca_file;
'DEFAULT/ssl_cert_file': value => $ssl_cert_file;
'DEFAULT/ssl_key_file': value => $ssl_key_file;
'ssl/ca_file': value => $ssl_ca_file;
'ssl/cert_file': value => $ssl_cert_file;
'ssl/key_file': value => $ssl_key_file;
'DEFAULT/tcp_keepidle': value => $tcp_keepidle;
'DEFAULT/wsgi_default_pool_size': value => $wsgi_default_pool_size;
'DEFAULT/max_header_line': value => $max_header_line;
@ -341,6 +341,12 @@ class ec2api::api (
'DEFAULT/ssl_insecure': value => $ssl_insecure;
}
ec2api_config {
'DEFAULT/ssl_ca_file': ensure => absent;
'DEFAULT/ssl_cert_file': ensure => absent;
'DEFAULT/ssl_key_file': ensure => absent;
}
if $manage_service {
if $enabled {
$service_ensure = 'running'

6
spec/classes/ec2api_api_spec.rb
View File

@ -17,9 +17,9 @@ describe 'ec2api::api', type: :class do
DEFAULT/ec2api_use_ssl
DEFAULT/service_down_time
DEFAULT/api_paste_config
DEFAULT/ssl_ca_file
DEFAULT/ssl_cert_file
DEFAULT/ssl_key_file
ssl/ca_file
ssl/cert_file
ssl/key_file
DEFAULT/tcp_keepidle
DEFAULT/wsgi_default_pool_size
DEFAULT/max_header_line