diff options
6 files changed, 7 insertions, 3 deletions
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 91c9b6a30..f93329670 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -2,6 +2,7 @@ debug = {{ cinder_logging_debug }} log_dir = /var/log/kolla/cinder +use_forwarded_for = true # Set use_stderr to False or the logs will also be sent to stderr # and collected by Docker diff --git a/ansible/roles/common/templates/heka-keystone.toml.j2 b/ansible/roles/common/templates/heka-keystone.toml.j2 index 1ece4ea02..5747d417c 100644 --- a/ansible/roles/common/templates/heka-keystone.toml.j2 +++ b/ansible/roles/common/templates/heka-keystone.toml.j2 @@ -3,7 +3,7 @@ type = "SandboxDecoder" filename = "lua_decoders/os_keystone_apache_log.lua" [keystone_apache_log_decoder.config] - apache_log_pattern = '%h %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' + apache_log_pattern = '%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' [keystone_apache_logstreamer_input] type = "LogstreamerInput" diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2 index a62c18ec5..ee2f17af5 100644 --- a/ansible/roles/glance/templates/glance-api.conf.j2 +++ b/ansible/roles/glance/templates/glance-api.conf.j2 @@ -3,6 +3,7 @@ debug = {{ glance_logging_debug }} # NOTE(elemoine) log_dir alone does not work for Glance log_file = /var/log/kolla/glance/api.log +use_forwarded_for = true bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_port = {{ glance_api_port }} diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index 3f1b13205..161ce15cf 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -9,6 +9,7 @@ defaults mode http option redispatch option httplog + option forwardfor retries 3 timeout http-request 10s timeout queue 1m diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 index d6286f16d..46c5725f7 100644 --- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 +++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 @@ -13,7 +13,7 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr ErrorLogFormat "%{cu}t %M" </IfVersion> ErrorLog "/var/log/kolla/{{ apache_dir }}/keystone-apache-public-error.log" - LogFormat "%h %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat + LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat CustomLog "/var/log/kolla/{{ apache_dir }}/keystone-apache-public-access.log" logformat </VirtualHost> @@ -27,6 +27,6 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr ErrorLogFormat "%{cu}t %M" </IfVersion> ErrorLog "/var/log/kolla/{{ apache_dir }}/keystone-apache-admin-error.log" - LogFormat "%h %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat + LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat CustomLog "/var/log/kolla/{{ apache_dir }}/keystone-apache-admin-access.log" logformat </VirtualHost> diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index e2f89d33a..352465b5c 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -3,6 +3,7 @@ debug = {{ nova_logging_debug }} log_dir = /var/log/kolla/nova +use_forwarded_for = true api_paste_config = /etc/nova/api-paste.ini state_path = /var/lib/nova |