From ce404cc09073cbc586d3f7d1848a7f3c243edaef Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 6 May 2022 20:43:30 +0900
Subject: [PATCH] apache+mod_wsgi: Disable SSL by default

During the previous cycle, a warning message was added to inform users
of this change.

Now the default value is updated so that SSL is disabled by default.

Change-Id: I7f32413d452e98306906002461ae0b4304d284ca
---
 manifests/wsgi/apache.pp                              | 11 +++--------
 .../notes/disable-apache-ssl-c2c62907caa34749.yaml    |  5 +++++
 spec/classes/gnocchi_wsgi_apache_spec.rb              |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/disable-apache-ssl-c2c62907caa34749.yaml

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index a088baae..a299672b 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -42,7 +42,7 @@
 #
 #   [*ssl*]
 #     Use ssl ? (boolean)
-#     Optional. Defaults to true
+#     Optional. Defaults to false
 #
 #   [*workers*]
 #     Number of WSGI workers to spawn.
@@ -110,7 +110,7 @@ class gnocchi::wsgi::apache (
   $port                        = 8041,
   $bind_host                   = undef,
   $path                        = '/',
-  $ssl                         = undef,
+  $ssl                         = false,
   $workers                     = $::os_workers,
   $ssl_cert                    = undef,
   $ssl_key                     = undef,
@@ -129,11 +129,6 @@ class gnocchi::wsgi::apache (
   $vhost_custom_fragment       = undef,
 ) {
 
-  if $ssl == undef {
-    warning('Default of the ssl parameter will be changed in a future release')
-  }
-  $ssl_real = pick($ssl, true)
-
   include gnocchi::deps
   include gnocchi::params
 
@@ -146,7 +141,7 @@ class gnocchi::wsgi::apache (
     path                        => $path,
     priority                    => $priority,
     servername                  => $servername,
-    ssl                         => $ssl_real,
+    ssl                         => $ssl,
     ssl_ca                      => $ssl_ca,
     ssl_cert                    => $ssl_cert,
     ssl_certs_dir               => $ssl_certs_dir,
diff --git a/releasenotes/notes/disable-apache-ssl-c2c62907caa34749.yaml b/releasenotes/notes/disable-apache-ssl-c2c62907caa34749.yaml
new file mode 100644
index 00000000..c34a69f0
--- /dev/null
+++ b/releasenotes/notes/disable-apache-ssl-c2c62907caa34749.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Default value of the ``gnocchi::wsgi::apache::ssl`` parameter has been
+    changed from ``true`` to ``false`` and now ssl is disabled by default.
diff --git a/spec/classes/gnocchi_wsgi_apache_spec.rb b/spec/classes/gnocchi_wsgi_apache_spec.rb
index 16293cc4..7ff39a29 100644
--- a/spec/classes/gnocchi_wsgi_apache_spec.rb
+++ b/spec/classes/gnocchi_wsgi_apache_spec.rb
@@ -10,7 +10,7 @@ describe 'gnocchi::wsgi::apache' do
         :group                       => 'gnocchi',
         :path                        => '/',
         :servername                  => facts[:fqdn],
-        :ssl                         => true,
+        :ssl                         => false,
         :threads                     => 1,
         :user                        => 'gnocchi',
         :workers                     => facts[:os_workers],
@@ -31,7 +31,7 @@ describe 'gnocchi::wsgi::apache' do
           :servername                => 'dummy.host',
           :bind_host                 => '10.42.51.1',
           :port                      => 12345,
-          :ssl                       => false,
+          :ssl                       => true,
           :workers                   => 8,
           :wsgi_process_display_name => 'gnocchi',
           :threads                   => 2,
@@ -52,7 +52,7 @@ describe 'gnocchi::wsgi::apache' do
         :group                     => 'gnocchi',
         :path                      => '/',
         :servername                => 'dummy.host',
-        :ssl                       => false,
+        :ssl                       => true,
         :threads                   => 2,
         :user                      => 'gnocchi',
         :vhost_custom_fragment     => 'Timeout 99',