openstack
/
puppet-ec2api
Code Issues Proposed changes

Revert "Replace deprecated [DEFAULT] ssl_* parameters" 

This reverts commit e3f44b4ef5.

Reason for revert:
The original change was wrong because ec2api uses own ssl options
instead of ones imported by oslo.service.

Conflicts:
	manifests/api.pp
	spec/classes/ec2api_api_spec.rb

Closes-Bug: #2011569
Change-Id: I592fc1da6b364f017a7892a30ff42a61d86f4d9f
(cherry picked from commit d5ffaf4cec)
This commit is contained in:
Takashi Kajinami 2023-03-14 17:24:54 +09:00
parent b1c6332108
commit 45be478d9e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/api.pp
View File

@ -289,9 +289,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;
'ssl/ca_file': value => $ssl_ca_file;
'ssl/cert_file': value => $ssl_cert_file;
'ssl/key_file': value => $ssl_key_file;
'DEFAULT/ssl_ca_file': value => $ssl_ca_file;
'DEFAULT/ssl_cert_file': value => $ssl_cert_file;
'DEFAULT/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;
@ -328,10 +328,11 @@ class ec2api::api (
'DEFAULT/ssl_insecure': value => pick($ssl_insecure, $::os_service_default);
}
# TODO(tkajinam): Remove this after 2023.1 release
ec2api_config {
'DEFAULT/ssl_ca_file': ensure => absent;
'DEFAULT/ssl_cert_file': ensure => absent;
'DEFAULT/ssl_key_file': ensure => absent;
'ssl/ca_file': ensure => absent;
'ssl/cert_file': ensure => absent;
'ssl/key_file': ensure => absent;
}
if $manage_service {

7
spec/classes/ec2api_api_spec.rb
View File

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