Add proper wsgi loglevel when openstack_logging_debug

Change-Id: I51144d92f34ed51c499a4119c059e6475d02eb46
2019-10-24 09:29:36 +02:00 · 2019-10-24 09:29:36 +02:00 · 0240763d7d
commit 0240763d7d
parent d40bdf4005
14 changed files with 56 additions and 1 deletions
--- a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
+++ b/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
@ -10,6 +10,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if aodh_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <Directory "{{ binary_path }}">
    <FilesMatch "^aodh-api$">
      Options Indexes FollowSymLinks MultiViews
--- a/ansible/roles/cinder/templates/cinder-wsgi.conf.j2
+++ b/ansible/roles/cinder/templates/cinder-wsgi.conf.j2
@ -9,6 +9,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if cinder_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ cinder_api_listen_port }}>
    WSGIDaemonProcess cinder-api processes={{ openstack_service_workers }} threads=1 user=cinder group=cinder display-name=%{GROUP} python-path={{ python_path }}
    WSGIProcessGroup cinder-api
--- a/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2
+++ b/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2
@ -6,6 +6,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if cloudkitty_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ cloudkitty_api_port }}>

  ErrorLog "/var/log/kolla/cloudkitty/cloudkitty-api-error.log"
--- a/ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2
+++ b/ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2
@ -6,6 +6,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if freezer_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ freezer_api_port }}>
    WSGIDaemonProcess freezer-api processes={{ openstack_service_workers }} threads=1 user=freezer display-name=%{GROUP}
    WSGIProcessGroup freezer-api
@ -15,7 +19,6 @@ TraceEnable off
    ErrorLog {{ freezer_log_dir }}/freezer-api.log
    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
    CustomLog {{ freezer_log_dir }}/freezer-api_access.log logformat
-    LogLevel info

    <Directory {{ python_path }}/freezer_api>
      Options Indexes FollowSymLinks MultiViews
--- a/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
+++ b/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
@ -10,6 +10,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if gnocchi_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ gnocchi_api_listen_port }}>

  ErrorLog "/var/log/kolla/gnocchi/gnocchi-api-error.log"
--- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
+++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
@ -12,6 +12,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if keystone_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <Directory "{{ binary_path }}">
    <FilesMatch "^keystone-wsgi-(public|admin)$">
        AllowOverride None
--- a/ansible/roles/masakari/templates/wsgi-masakari.conf.j2
+++ b/ansible/roles/masakari/templates/wsgi-masakari.conf.j2
@ -11,6 +11,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if masakari_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <Directory "{{ binary_path }}">
    <FilesMatch "^masakari-wsgi$">
      Options Indexes FollowSymLinks MultiViews
--- a/ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2
+++ b/ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2
@ -5,6 +5,10 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ monasca_ap

 TraceEnable off

+{% if monasca_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ monasca_api_port }}>

    ErrorLog "/var/log/kolla/monasca/monasca-api-error.log"
--- a/ansible/roles/monasca/templates/monasca-log-api/wsgi-log-api.conf.j2
+++ b/ansible/roles/monasca/templates/monasca-log-api/wsgi-log-api.conf.j2
@ -5,6 +5,10 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ monasca_lo

 TraceEnable off

+{% if monasca_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ monasca_log_api_port }}>

    ErrorLog "/var/log/kolla/monasca/monasca-log-api-error.log"
--- a/ansible/roles/panko/templates/wsgi-panko.conf.j2
+++ b/ansible/roles/panko/templates/wsgi-panko.conf.j2
@ -6,6 +6,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if panko_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <Directory "{{ binary_path }}">
    <FilesMatch "^panko-api$">
        Require all granted
--- a/ansible/roles/placement/templates/placement-api-wsgi.conf.j2
+++ b/ansible/roles/placement/templates/placement-api-wsgi.conf.j2
@ -12,6 +12,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if placement_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ placement_api_listen_port }}>
    WSGIDaemonProcess placement-api processes={{ openstack_service_workers }} threads=1 user=placement group=placement display-name=%{GROUP} python-path={{ python_path }}
    WSGIProcessGroup placement-api
--- a/ansible/roles/qinling/templates/wsgi-qinling.conf.j2
+++ b/ansible/roles/qinling/templates/wsgi-qinling.conf.j2
@ -10,6 +10,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if qinling_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ qinling_api_port }}>

  ## Vhost docroot
--- a/ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2
+++ b/ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2
@ -5,6 +5,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if vitrage_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ vitrage_api_port }}>

  ## Vhost docroot
--- a/ansible/roles/zun/templates/wsgi-zun.conf.j2
+++ b/ansible/roles/zun/templates/wsgi-zun.conf.j2
@ -5,6 +5,10 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off

+{% if zun_logging_debug | bool %}
+LogLevel info
+{% endif %}
+
 <VirtualHost *:{{ zun_api_port }}>

  ## Vhost docroot