diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 793fb6781..8596fd254 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -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, diff --git a/releasenotes/notes/prepare-to-change-apache-ssl-465063265e7834ac.yaml b/releasenotes/notes/prepare-to-change-apache-ssl-465063265e7834ac.yaml new file mode 100644 index 000000000..63a3d3f8f --- /dev/null +++ b/releasenotes/notes/prepare-to-change-apache-ssl-465063265e7834ac.yaml @@ -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.