From 943ffd76ed0e9b20ad57c36b7bfa173f08a3c0ec Mon Sep 17 00:00:00 2001
From: "Michal Jastrzebski (inc0)" <michal.jastrzebski@intel.com>
Date: Mon, 21 Sep 2015 13:55:09 +0200
Subject: [PATCH] Glance logging to rsyslog

Configure glance to use rsyslog container as logging mechanism

Change-Id: I60f604d7a85bb4309b26be03cd6b8aac14840fe7
Implements: bp logging-container
---
 ansible/roles/common/templates/rsyslog.conf.j2         | 6 ++++++
 ansible/roles/glance/tasks/start.yml                   | 8 ++++++--
 ansible/roles/glance/templates/glance-api.conf.j2      | 3 +++
 ansible/roles/glance/templates/glance-registry.conf.j2 | 3 +++
 docker/logging/rsyslog/config-external.sh              | 5 +++++
 5 files changed, 23 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 ansible/roles/glance/templates/glance-api.conf.j2
 mode change 100644 => 100755 ansible/roles/glance/templates/glance-registry.conf.j2

diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index 26c6198fe5..4b6b26a0ce 100755
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ b/ansible/roles/common/templates/rsyslog.conf.j2
@@ -9,6 +9,12 @@ $RepeatedMsgReduction on
 $template KollaAnsibleFile,"/var/log/kolla_ansible.log"
 :syslogtag,contains,"ansible" ?KollaAnsibleFile
 
+$template GlanceApiFile,"/var/log/glance/glance_api.log"
+:syslogtag,contains,"glance-api" ?GlanceApiFile
+
+$template GlanceRegistryFile,"/var/log/glance/glance_registry.log"
+:syslogtag,contains,"glance-registry" ?GlanceRegistryFile
+
 $template DynFile,"/var/log/syslog.log"
 *.* ?DynFile
 & ~
diff --git a/ansible/roles/glance/tasks/start.yml b/ansible/roles/glance/tasks/start.yml
index 068fc996cf..ea42edb3f2 100644
--- a/ansible/roles/glance/tasks/start.yml
+++ b/ansible/roles/glance/tasks/start.yml
@@ -13,7 +13,9 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: glance_registry
     image: "{{ glance_registry_image_full }}"
-    volumes: "{{ node_config_directory }}/glance-registry/:/opt/kolla/config_files/:ro"
+    volumes:
+      - "{{ node_config_directory }}/glance-registry/:/opt/kolla/config_files/:ro"
+      - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - glance_data
     env:
@@ -34,7 +36,9 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: glance_api
     image: "{{ glance_api_image_full }}"
-    volumes: "{{ node_config_directory }}/glance-api/:/opt/kolla/config_files/:ro"
+    volumes:
+      - "{{ node_config_directory }}/glance-api/:/opt/kolla/config_files/:ro"
+      - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['glance-api']
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
old mode 100644
new mode 100755
index 96c15cc970..33f60625a4
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -9,6 +9,9 @@ notification_driver = noop
 
 registry_host = {{ kolla_internal_address }}
 
+use_syslog = True
+syslog_log_facility = LOG_LOCAL0
+
 [database]
 connection = mysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }}
 
diff --git a/ansible/roles/glance/templates/glance-registry.conf.j2 b/ansible/roles/glance/templates/glance-registry.conf.j2
old mode 100644
new mode 100755
index b9031eb115..a5970a82e5
--- a/ansible/roles/glance/templates/glance-registry.conf.j2
+++ b/ansible/roles/glance/templates/glance-registry.conf.j2
@@ -7,6 +7,9 @@ bind_port = {{ glance_registry_port }}
 
 notification_driver = noop
 
+use_syslog = True
+syslog_log_facility = LOG_LOCAL0
+
 [database]
 connection = mysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }}
 
diff --git a/docker/logging/rsyslog/config-external.sh b/docker/logging/rsyslog/config-external.sh
index 4352a6f08e..a935f7dba8 100755
--- a/docker/logging/rsyslog/config-external.sh
+++ b/docker/logging/rsyslog/config-external.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+if [[ -f "/dev/log" ]]; then
+    rm "/dev/log"
+fi
+
 SOURCE="/opt/kolla/rsyslog/rsyslog.conf"
 TARGET="/etc/rsyslog.conf"
 OWNER="root"