diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 4b686f11..673aa0c3 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. @@ -119,7 +119,7 @@ class aodh::wsgi::apache ( $port = 8042, $bind_host = undef, $path = '/', - $ssl = undef, + $ssl = false, $workers = $::os_workers, $ssl_cert = undef, $ssl_key = undef, @@ -140,11 +140,6 @@ class aodh::wsgi::apache ( $vhost_custom_fragment = undef, ) inherits aodh::params { - if $ssl == undef { - warning('Default of the ssl parameter will be changed in a future release') - } - $ssl_real = pick($ssl, true) - include aodh::deps # NOTE(aschultz): needed because the packaging may introduce some apache @@ -158,7 +153,7 @@ class aodh::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-cebd6146263d9f8f.yaml b/releasenotes/notes/disable-apache-ssl-cebd6146263d9f8f.yaml new file mode 100644 index 00000000..e3967839 --- /dev/null +++ b/releasenotes/notes/disable-apache-ssl-cebd6146263d9f8f.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Default value of the ``aodh::wsgi::apache::ssl`` parameter has been changed + from ``true`` to ``false`` and now ssl is disabled by default. diff --git a/spec/classes/aodh_wsgi_apache_spec.rb b/spec/classes/aodh_wsgi_apache_spec.rb index afc0d7ef..9e434478 100644 --- a/spec/classes/aodh_wsgi_apache_spec.rb +++ b/spec/classes/aodh_wsgi_apache_spec.rb @@ -10,7 +10,7 @@ describe 'aodh::wsgi::apache' do :group => 'aodh', :path => '/', :servername => facts[:fqdn], - :ssl => true, + :ssl => false, :threads => 1, :user => 'aodh', :workers => facts[:os_workers], @@ -31,7 +31,7 @@ describe 'aodh::wsgi::apache' do :servername => 'dummy.host', :bind_host => '10.42.51.1', :port => 12345, - :ssl => false, + :ssl => true, :wsgi_process_display_name => 'aodh', :workers => 37, :custom_wsgi_process_options => { @@ -52,7 +52,7 @@ describe 'aodh::wsgi::apache' do :group => 'aodh', :path => '/', :servername => 'dummy.host', - :ssl => false, + :ssl => true, :threads => 1, :user => 'aodh', :workers => 37,