diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index dda7965a9..6900f2df7 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -40,7 +40,7 @@ # # [*ssl*] # Use ssl ? (boolean) -# Optional. Defaults to true +# Optional. Defaults to false # # [*workers*] # Number of WSGI workers to spawn. @@ -103,7 +103,7 @@ class neutron::wsgi::apache ( $port = 9696, $bind_host = undef, $path = '/', - $ssl = undef, + $ssl = false, $workers = $::os_workers, $ssl_cert = undef, $ssl_key = undef, @@ -121,11 +121,6 @@ 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 @@ -138,7 +133,7 @@ class neutron::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-fe6cf3809251d392.yaml b/releasenotes/notes/disable-apache-ssl-fe6cf3809251d392.yaml new file mode 100644 index 000000000..2eae0cc77 --- /dev/null +++ b/releasenotes/notes/disable-apache-ssl-fe6cf3809251d392.yaml @@ -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. diff --git a/spec/classes/neutron_wsgi_apache_spec.rb b/spec/classes/neutron_wsgi_apache_spec.rb index 2819f8893..6d9ba76a8 100644 --- a/spec/classes/neutron_wsgi_apache_spec.rb +++ b/spec/classes/neutron_wsgi_apache_spec.rb @@ -9,7 +9,7 @@ describe 'neutron::wsgi::apache' do :group => 'neutron', :path => '/', :servername => facts[:fqdn], - :ssl => true, + :ssl => false, :threads => 1, :user => 'neutron', :workers => facts[:os_workers], @@ -30,7 +30,7 @@ describe 'neutron::wsgi::apache' do :servername => 'dummy.host', :bind_host => '10.42.51.1', :port => 12345, - :ssl => false, + :ssl => true, :wsgi_process_display_name => 'neutron', :workers => 37, :custom_wsgi_process_options => { @@ -48,7 +48,7 @@ describe 'neutron::wsgi::apache' do :group => 'neutron', :path => '/', :servername => 'dummy.host', - :ssl => false, + :ssl => true, :threads => 1, :user => 'neutron', :workers => 37,