From 6e0ecf4363d8ebcdf91e7f3749486affa2d4d78f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 3 Nov 2021 22:16:10 +0900 Subject: [PATCH] Prepare to update default of ::wsgi::apache::ssl Currently the ::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: I24a692633133db5b453f65accf40f87687bec90e --- manifests/wsgi/apache.pp | 11 ++++++++--- ...prepare-to-change-apache-ssl-9377b6c2b888bba7.yaml | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/prepare-to-change-apache-ssl-9377b6c2b888bba7.yaml diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 18da3f0..8fd84a7 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -101,7 +101,7 @@ class cloudkitty::wsgi::apache ( $port = 8889, $bind_host = undef, $path = '/', - $ssl = true, + $ssl = undef, $workers = $::os_workers, $ssl_cert = undef, $ssl_key = undef, @@ -119,11 +119,16 @@ class cloudkitty::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 cloudkitty::deps include cloudkitty::params include apache include apache::mod::wsgi - if $ssl { + if $ssl_real { include apache::mod::ssl } @@ -134,7 +139,7 @@ class cloudkitty::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, diff --git a/releasenotes/notes/prepare-to-change-apache-ssl-9377b6c2b888bba7.yaml b/releasenotes/notes/prepare-to-change-apache-ssl-9377b6c2b888bba7.yaml new file mode 100644 index 0000000..b772b7b --- /dev/null +++ b/releasenotes/notes/prepare-to-change-apache-ssl-9377b6c2b888bba7.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Default value of the ``cloudkitty::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.