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

This commit is contained in:
Zuul 2021-11-03 23:14:10 +00:00 committed by Gerrit Code Review
commit b97976181f
2 changed files with 14 additions and 3 deletions

View File

@ -103,7 +103,7 @@ class neutron::wsgi::apache (
$port = 9696,
$bind_host = undef,
$path = '/',
$ssl = true,
$ssl = undef,
$workers = $::os_workers,
$ssl_cert = undef,
$ssl_key = undef,
@ -121,11 +121,16 @@ class neutron::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 neutron::deps
include neutron::params
include apache
include apache::mod::wsgi
if $ssl {
if $ssl_real {
include apache::mod::ssl
}
@ -156,7 +161,7 @@ class neutron::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 ``neutron::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.