openstack/puppet-neutron
Code Issues Proposed changes

apache+mod_wsgi: Disable SSL by default

Browse Source 
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: Ief58c5fa7b7862568153e23389fcd5244cebf3c4
This commit is contained in:
Takashi Kajinami 2022-05-06 20:59:41 +09:00
parent df0d55cf78
commit 1e2738a495
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/wsgi/apache.pp
View File

@ -40,7 +40,7 @@
# #
# [*ssl*] # [*ssl*]
# Use ssl ? (boolean) # Use ssl ? (boolean)
# Optional. Defaults to true # Optional. Defaults to false
# #
# [*workers*] # [*workers*]
# Number of WSGI workers to spawn. # Number of WSGI workers to spawn.
@ -103,7 +103,7 @@ class neutron::wsgi::apache (
$port = 9696, $port = 9696,
$bind_host = undef, $bind_host = undef,
$path = '/', $path = '/',
$ssl = undef, $ssl = false,
$workers = $::os_workers, $workers = $::os_workers,
$ssl_cert = undef, $ssl_cert = undef,
$ssl_key = undef, $ssl_key = undef,
@ -121,11 +121,6 @@ class neutron::wsgi::apache (
$custom_wsgi_process_options = {}, $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::deps
include neutron::params include neutron::params
@ -138,7 +133,7 @@ class neutron::wsgi::apache (
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
ssl => $ssl_real, ssl => $ssl,
ssl_ca => $ssl_ca, ssl_ca => $ssl_ca,
ssl_cert => $ssl_cert, ssl_cert => $ssl_cert,
ssl_certs_dir => $ssl_certs_dir, ssl_certs_dir => $ssl_certs_dir,

5
releasenotes/notes/disable-apache-ssl-fe6cf3809251d392.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Default value of the ``neutron::wsgi::apache::ssl`` parameter has been
changed from ``true`` to ``false`` and now ssl is disabled by default.

6
spec/classes/neutron_wsgi_apache_spec.rb
View File

@ -9,7 +9,7 @@ describe 'neutron::wsgi::apache' do
:group => 'neutron', :group => 'neutron',
:path => '/', :path => '/',
:servername => facts[:fqdn], :servername => facts[:fqdn],
:ssl => true, :ssl => false,
:threads => 1, :threads => 1,
:user => 'neutron', :user => 'neutron',
:workers => facts[:os_workers], :workers => facts[:os_workers],
@ -30,7 +30,7 @@ describe 'neutron::wsgi::apache' do
:servername => 'dummy.host', :servername => 'dummy.host',
:bind_host => '10.42.51.1', :bind_host => '10.42.51.1',
:port => 12345, :port => 12345,
:ssl => false, :ssl => true,
:wsgi_process_display_name => 'neutron', :wsgi_process_display_name => 'neutron',
:workers => 37, :workers => 37,
:custom_wsgi_process_options => { :custom_wsgi_process_options => {
@ -48,7 +48,7 @@ describe 'neutron::wsgi::apache' do
:group => 'neutron', :group => 'neutron',
:path => '/', :path => '/',
:servername => 'dummy.host', :servername => 'dummy.host',
:ssl => false, :ssl => true,
:threads => 1, :threads => 1,
:user => 'neutron', :user => 'neutron',
:workers => 37, :workers => 37,