From 0240763d7d7b1bb6359c8e9bc8fc5eed07b6f689 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 24 Oct 2019 09:29:36 +0200
Subject: [PATCH] Add proper wsgi loglevel when openstack_logging_debug

Change-Id: I51144d92f34ed51c499a4119c059e6475d02eb46
---
 ansible/roles/aodh/templates/wsgi-aodh.conf.j2               | 4 ++++
 ansible/roles/cinder/templates/cinder-wsgi.conf.j2           | 4 ++++
 ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2   | 4 ++++
 ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2     | 5 ++++-
 ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2         | 4 ++++
 ansible/roles/keystone/templates/wsgi-keystone.conf.j2       | 4 ++++
 ansible/roles/masakari/templates/wsgi-masakari.conf.j2       | 4 ++++
 ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2 | 4 ++++
 .../monasca/templates/monasca-log-api/wsgi-log-api.conf.j2   | 4 ++++
 ansible/roles/panko/templates/wsgi-panko.conf.j2             | 4 ++++
 ansible/roles/placement/templates/placement-api-wsgi.conf.j2 | 4 ++++
 ansible/roles/qinling/templates/wsgi-qinling.conf.j2         | 4 ++++
 ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2         | 4 ++++
 ansible/roles/zun/templates/wsgi-zun.conf.j2                 | 4 ++++
 14 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 b/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
index 932eb6ec0f..4a86b7af42 100644
--- 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
diff --git a/ansible/roles/cinder/templates/cinder-wsgi.conf.j2 b/ansible/roles/cinder/templates/cinder-wsgi.conf.j2
index e926fd52da..616af7beec 100644
--- 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
diff --git a/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2
index 24b170a966..1939705146 100644
--- 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"
diff --git a/ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2 b/ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2
index 601bfacf5a..69e9e32446 100644
--- 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
diff --git a/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 b/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
index a78219555d..c7d3dfa405 100644
--- 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"
diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
index 99899e4f2e..107d4ea546 100644
--- 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
diff --git a/ansible/roles/masakari/templates/wsgi-masakari.conf.j2 b/ansible/roles/masakari/templates/wsgi-masakari.conf.j2
index 9849b5bb49..86b8483282 100644
--- 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
diff --git a/ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2 b/ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2
index e5cf902967..35e38bff7b 100644
--- 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"
diff --git 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
index eac430f1af..f21ff2987c 100644
--- 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"
diff --git a/ansible/roles/panko/templates/wsgi-panko.conf.j2 b/ansible/roles/panko/templates/wsgi-panko.conf.j2
index 969073bbea..657aa38a0c 100644
--- 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
diff --git a/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 b/ansible/roles/placement/templates/placement-api-wsgi.conf.j2
index 882b7b8937..d26f481f88 100644
--- 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
diff --git a/ansible/roles/qinling/templates/wsgi-qinling.conf.j2 b/ansible/roles/qinling/templates/wsgi-qinling.conf.j2
index 955e27f712..f9b276137f 100644
--- 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
diff --git a/ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2 b/ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2
index 238525f327..054256ddfc 100644
--- 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
diff --git a/ansible/roles/zun/templates/wsgi-zun.conf.j2 b/ansible/roles/zun/templates/wsgi-zun.conf.j2
index 7639a5dbf5..e906f7fa23 100644
--- 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