commit 6e95dab57eaabe2cd40ecd650c0d68eee124a9f9
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Feb 15 12:48:16 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Feb 15 12:48:16 2019 +0000
tree d2e9b824a0196fd09021dd5e510565ee3b2e1acd
parent f59fd2b76838b0a0ffa314953bc8573b8b8f7478
parent 99e87f5d895e267cd12d54369ca84c79deeb96fb

Merge "Write criproxy log to corresponding folder"

kubernetes/_common.sls

diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index ae8a851..aaabd23 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -134,6 +134,12 @@
     - group: root
     - mode: 0750
 
+/var/log/criproxy:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 0750
+
 /etc/criproxy/node.conf:
   file.managed:
     - user: root

kubernetes/files/systemd/criproxy.service

diff --git a/kubernetes/files/systemd/criproxy.service b/kubernetes/files/systemd/criproxy.service
index 9980501..3bb3961 100644
--- a/kubernetes/files/systemd/criproxy.service
+++ b/kubernetes/files/systemd/criproxy.service
@@ -24,7 +24,7 @@
           {%- endif %}
           -listen /var/run/criproxy.sock \
           -v 3 \
-          -alsologtostderr \
+          -log_dir=/var/log/criproxy \
 {%- if salt['pkg.version_cmp'](version,'1.8') < 0 %}
           -apiVersion {{ version }} \
 {%- endif %}