Prepare to update default of <service>::wsgi::apache::ssl

Currently the <service>::wsgi::apache::ssl parameters have inconsistent
default values. Some parameters default to true while the other default
to false.

Based on the following points, false is considered to be the more
reasonable default.
 - Usage of SSL is optional and is not always required
 - There are other methods(like load-balancer) to implement SSL
   termination
 - Enabling SSL doesn't work with the default values currently
   defined, and requires additional parameters like ssl_cert.
 - false is the default value defined in the base implementation in
   puppet-openstacklib.

This change is the preparation to change the default value, and
introduces a warning message to make users aware of the future change.

Change-Id: I7f550bbcc2f26ce1bbcc580ec1209f1ee2126b53
This commit is contained in:
Takashi Kajinami 2021-11-03 22:20:39 +09:00
parent ada3f823d1
commit da21235878
2 changed files with 14 additions and 3 deletions

View File

@ -101,7 +101,7 @@ class watcher::wsgi::apache (
$port = 9322,
$bind_host = undef,
$path = '/',
$ssl = true,
$ssl = undef,
$workers = $::os_workers,
$ssl_cert = undef,
$ssl_key = undef,
@ -119,11 +119,16 @@ class watcher::wsgi::apache (
$custom_wsgi_process_options = {},
) {
if $ssl == undef {
warning('Default of the ssl parameter will be changed in a future release')
}
$ssl_real = pick($ssl, true)
include watcher::deps
include watcher::params
include apache
include apache::mod::wsgi
if $ssl {
if $ssl_real {
include apache::mod::ssl
}
@ -134,7 +139,7 @@ class watcher::wsgi::apache (
path => $path,
priority => $priority,
servername => $servername,
ssl => $ssl,
ssl => $ssl_real,
ssl_ca => $ssl_ca,
ssl_cert => $ssl_cert,
ssl_certs_dir => $ssl_certs_dir,

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Default value of the ``watcher::wsgi::apache::ssl`` parameter will be
changed from ``true`` to ``false`` in a future release. Make sure
the parameter is set to the desired value.