From 80fbe88bf40d0bc18f0d68376893be49fa523932 Mon Sep 17 00:00:00 2001
From: grakiss <grakiss.wanglei@huawei.com>
Date: Fri, 22 Apr 2016 03:04:12 -0400
Subject: FIX: mariadb cluster failed on centos7

JIRA:COMPASS-373
  - use shell to support the parameter
  - remove blank user
  - adapte http service name and config path

Change-Id: I6625f3c53bfa8ff3e3792ec339aa2e63bcf1da83
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
---
 .../ansible/roles/keystone/templates/wsgi-keystone.conf.j2        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'deploy/adapters/ansible/roles/keystone/templates')

diff --git a/deploy/adapters/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/deploy/adapters/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
index ff7526a8..64d864af 100644
--- a/deploy/adapters/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
+++ b/deploy/adapters/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
@@ -8,8 +8,8 @@
     <IfVersion >= 2.4>
       ErrorLogFormat "%{cu}t %M"
     </IfVersion>
-    ErrorLog /var/log/apache2/keystone.log
-    CustomLog /var/log/apache2/keystone_access.log combined
+    ErrorLog /var/log/{{ http_service_name }}/keystone.log
+    CustomLog /var/log/{{ http_service_name }}/keystone_access.log combined
 
     <Directory /usr/bin>
         <IfVersion >= 2.4>
@@ -31,8 +31,8 @@
     <IfVersion >= 2.4>
       ErrorLogFormat "%{cu}t %M"
     </IfVersion>
-    ErrorLog /var/log/apache2/keystone.log
-    CustomLog /var/log/apache2/keystone_access.log combined
+    ErrorLog /var/log/{{ http_service_name }}/keystone.log
+    CustomLog /var/log/{{ http_service_name }}/keystone_access.log combined
 
     <Directory /usr/bin>
         <IfVersion >= 2.4>
-- 
cgit 1.2.3-korg