aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Jastrzebski <inc007@gmail.com>2015-09-24 15:48:01 +0200
committerMichal Jastrzebski <inc007@gmail.com>2015-09-24 14:08:25 +0200
commitf99a27f0c5e21818278bac355016a80d20932ea2 (patch)
treeaf5e70ba573651d4f7b5fb4db3985bced1643974
parent10776e57f96d0feff23e8f57d51769318b2e46a9 (diff)
downloadkolla-f99a27f0c5e21818278bac355016a80d20932ea2.tar.gz
kolla-f99a27f0c5e21818278bac355016a80d20932ea2.zip
Keystone logging to rsyslog
Configure keystone to use rsyslog container as logging mechanism Change-Id: Id77574fe841e9c2a9d870b712ffd0c26b5463ded Implements: bp logging-container
-rwxr-xr-xansible/roles/common/templates/rsyslog.conf.j26
-rw-r--r--ansible/roles/keystone/tasks/start.yml4
-rw-r--r--ansible/roles/keystone/templates/wsgi-keystone.conf.j28
3 files changed, 13 insertions, 5 deletions
diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index 5fd5f0406..8e129adda 100755
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ b/ansible/roles/common/templates/rsyslog.conf.j2
@@ -60,6 +60,12 @@ $template NeutronMetadataAgentFile,"/var/log/neutron/neutron-metadata-agent.log"
$template NeutronL3AgentFile,"/var/log/neutron/neutron-l3-agent.log"
:syslogtag,contains,"neutron-l3-agent" ?NeutronL3AgentFile
+$template KeystoneErrorFile,"/var/log/keystone/keystone-error.log"
+:syslogtag,contains,"keystone-error" ?KeystoneErrorFile
+
+$template KeystoneAccessFile,"/var/log/keystone/keystone-access.log"
+:syslogtag,contains,"keystone-access" ?KeystoneAccessFile
+
$template DynFile,"/var/log/syslog.log"
*.* ?DynFile
& ~
diff --git a/ansible/roles/keystone/tasks/start.yml b/ansible/roles/keystone/tasks/start.yml
index 3833ef9ad..1187f99d1 100644
--- a/ansible/roles/keystone/tasks/start.yml
+++ b/ansible/roles/keystone/tasks/start.yml
@@ -13,6 +13,8 @@
insecure_registry: "{{ docker_insecure_registry }}"
name: keystone
image: "{{ keystone_image_full }}"
- volumes: "{{ node_config_directory }}/keystone/:/opt/kolla/config_files/:ro"
+ volumes:
+ - "{{ node_config_directory }}/keystone/:/opt/kolla/config_files/:ro"
+ - "/var/lib/kolla/dev/log:/dev/log"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
index 5c46c8be6..875b977ef 100644
--- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
+++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
@@ -11,8 +11,8 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
- ErrorLog /var/log/{{ apache_dir }}/keystone.log
- CustomLog /var/log/{{ apache_dir }}/keystone_access.log combined
+ ErrorLog "|/usr/bin/logger -t keystone-error"
+ CustomLog "|/usr/bin/logger -t keystone-access" combined
</VirtualHost>
<VirtualHost *:{{ keystone_admin_port }}>
@@ -24,6 +24,6 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
- ErrorLog /var/log/{{ apache_dir }}/keystone.log
- CustomLog /var/log/{{ apache_dir }}/keystone_access.log combined
+ ErrorLog "|/usr/bin/logger -t keystone-error"
+ CustomLog "|/usr/bin/logger -t keystone-access" combined
</VirtualHost>