diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 40c94118e..cb689af55 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -112,6 +112,11 @@ # (Optional) The log format for the virtualhost. # Defaults to undef # +# [*access_log_env_var*] +# (Optional) Specifies that only requests with particular +# environment variables be logged. +# Defaults to undef +# # [*error_log_file*] # (Optional) The error log file name for the virtualhost. # Defaults to undef @@ -166,6 +171,7 @@ class keystone::wsgi::apache ( $access_log_pipe = undef, $access_log_syslog = undef, $access_log_format = undef, + $access_log_env_var = undef, $error_log_file = undef, $error_log_pipe = undef, $error_log_syslog = undef, @@ -215,6 +221,7 @@ class keystone::wsgi::apache ( access_log_pipe => $access_log_pipe, access_log_syslog => $access_log_syslog, access_log_format => $access_log_format, + access_log_env_var => $access_log_env_var, error_log_file => $error_log_file, error_log_pipe => $error_log_pipe, error_log_syslog => $error_log_syslog, diff --git a/releasenotes/notes/access_log_env_var-061dae2379ea550f.yaml b/releasenotes/notes/access_log_env_var-061dae2379ea550f.yaml new file mode 100644 index 000000000..07c4a6caa --- /dev/null +++ b/releasenotes/notes/access_log_env_var-061dae2379ea550f.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Add the ``access_log_env_var`` parameter to the ``keystone::wsgi::apache`` + class to allow filtering logs (eg. suppress healthecks) diff --git a/spec/classes/keystone_wsgi_apache_spec.rb b/spec/classes/keystone_wsgi_apache_spec.rb index b8dfc013c..b8bedd76c 100644 --- a/spec/classes/keystone_wsgi_apache_spec.rb +++ b/spec/classes/keystone_wsgi_apache_spec.rb @@ -40,6 +40,7 @@ describe 'keystone::wsgi::apache' do :access_log_pipe => nil, :access_log_syslog => nil, :access_log_format => nil, + :access_log_env_var => nil, :error_log_file => nil, :error_log_pipe => nil, :error_log_syslog => nil, @@ -117,16 +118,18 @@ describe 'keystone::wsgi::apache' do context 'with custom access logging' do let :params do { - :access_log_format => 'foo', - :access_log_syslog => 'syslog:local0', - :error_log_syslog => 'syslog:local1', + :access_log_format => 'foo', + :access_log_syslog => 'syslog:local0', + :error_log_syslog => 'syslog:local1', + :access_log_env_var => '!dontlog', } end it { should contain_openstacklib__wsgi__apache('keystone_wsgi').with( - :access_log_format => params[:access_log_format], - :access_log_syslog => params[:access_log_syslog], - :error_log_syslog => params[:error_log_syslog], + :access_log_format => params[:access_log_format], + :access_log_syslog => params[:access_log_syslog], + :error_log_syslog => params[:error_log_syslog], + :access_log_env_var => params[:access_log_env_var], )} end