openstack/kolla-ansible
Code Issues Proposed changes

Merge "Change keystone log dir"

Browse Source
This commit is contained in:
Jenkins 2016-04-03 00:48:09 +00:00 committed by Gerrit Code Review
commit 808d6baa44
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/common/templates/cron-logrotate-keystone.conf.j2
View File

@ -1,5 +1,3 @@
{% set apache_dir = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
"/var/log/kolla/keystone/*.log" "/var/log/kolla/keystone/*.log"
"/var/log/kolla/{{ apache_dir }}/keystone-apache-*.log"
{ {
} }

3
ansible/roles/common/templates/heka-keystone.toml.j2
View File

@ -1,4 +1,3 @@
{% set apache_dir = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
[keystone_apache_log_decoder] [keystone_apache_log_decoder]
type = "SandboxDecoder" type = "SandboxDecoder"
filename = "lua_decoders/os_keystone_apache_log.lua" filename = "lua_decoders/os_keystone_apache_log.lua"
@ -9,6 +8,6 @@ filename = "lua_decoders/os_keystone_apache_log.lua"
type = "LogstreamerInput" type = "LogstreamerInput"
decoder = "keystone_apache_log_decoder" decoder = "keystone_apache_log_decoder"
log_directory = "/var/log/kolla" log_directory = "/var/log/kolla"
file_match = '{{ apache_dir }}/keystone-apache-(?P<Service>.+)-access\.log\.?(?P<Seq>\d*)$' file_match = 'keystone/keystone-apache-(?P<Service>.+)-access\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"] priority = ["^Seq"]
differentiator = ["keystone-apache-", "Service"] differentiator = ["keystone-apache-", "Service"]

10
ansible/roles/keystone/templates/wsgi-keystone.conf.j2
View File

@ -1,4 +1,4 @@
{% set apache_dir = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %} {% set keystone_log_dir = '/var/log/kolla/keystone' %}
{% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_public_port }} Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_public_port }}
Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }} Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}
@ -12,9 +12,9 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr
<IfVersion >= 2.4> <IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion> </IfVersion>
ErrorLog "/var/log/kolla/{{ apache_dir }}/keystone-apache-public-error.log" ErrorLog "{{ keystone_log_dir }}/keystone-apache-public-error.log"
LogFormat "%{X-Forwarded-For}i %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 CustomLog "{{ keystone_log_dir }}/keystone-apache-public-access.log" logformat
</VirtualHost> </VirtualHost>
<VirtualHost *:{{ keystone_admin_port }}> <VirtualHost *:{{ keystone_admin_port }}>
@ -26,7 +26,7 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr
<IfVersion >= 2.4> <IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion> </IfVersion>
ErrorLog "/var/log/kolla/{{ apache_dir }}/keystone-apache-admin-error.log" ErrorLog "{{ keystone_log_dir }}/keystone-apache-admin-error.log"
LogFormat "%{X-Forwarded-For}i %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 CustomLog "{{ keystone_log_dir }}/keystone-apache-admin-access.log" logformat
</VirtualHost> </VirtualHost>

9
docker/keystone/extend_start.sh
View File

@ -24,15 +24,6 @@ if [[ $(stat -c %a ${KEYSTONE_LOG_DIR}) != "755" ]]; then
chmod 755 ${KEYSTONE_LOG_DIR} chmod 755 ${KEYSTONE_LOG_DIR}
fi fi
# Create log dir for Apache logs
APACHE_LOG_DIR="/var/log/kolla/${APACHE_DIR}"
if [[ ! -d "${APACHE_LOG_DIR}" ]]; then
mkdir -p ${APACHE_LOG_DIR}
fi
if [[ $(stat -c %a ${APACHE_LOG_DIR}) != "755" ]]; then
chmod 755 ${APACHE_LOG_DIR}
fi
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then