commit 1a850802c24cae7168335725a9a76a5d1d062c27
author Ales Komarek <akomarek@mirantis.com> Mon Jan 30 13:13:35 2017 +0000
committer Gerrit Code Review <gerrit2@50f9da5d34fb> Mon Jan 30 13:13:35 2017 +0000
tree 2fcbfd7f4a19e00eff4ef4b0e417b2af192f715f
parent ca87550e3ce93f0f7f53fddf41ca66cb6a7bddae
parent 275530149a2c5b7061c93301f40fdb34275034a9

Merge "Provide grains for building the main dashboard"

.gitreview

diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 4ddfb59..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack/salt-formula-keystone.git
\ No newline at end of file

keystone/files/mitaka/wsgi-keystone.conf

diff --git a/keystone/files/mitaka/wsgi-keystone.conf b/keystone/files/mitaka/wsgi-keystone.conf
index b82c820..74a1c30 100644
--- a/keystone/files/mitaka/wsgi-keystone.conf
+++ b/keystone/files/mitaka/wsgi-keystone.conf
@@ -10,7 +10,7 @@
 
     WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
     WSGIProcessGroup keystone-public
-    WSGIScriptAlias / /usr/local/bin/keystone-wsgi-public
+    WSGIScriptAlias / /usr/bin/keystone-wsgi-public
     WSGIApplicationGroup %{GLOBAL}
     WSGIPassAuthorization On
     LimitRequestBody 114688
@@ -19,7 +19,7 @@
     </IfVersion>
 {%- include "apache/files/_log.conf" %}
 
-    <Directory /usr/local/bin>
+    <Directory /usr/bin>
         <IfVersion >= 2.4>
             Require all granted
         </IfVersion>
@@ -63,7 +63,7 @@
 
     WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
     WSGIProcessGroup keystone-admin
-    WSGIScriptAlias / /usr/local/bin/keystone-wsgi-admin
+    WSGIScriptAlias / /usr/bin/keystone-wsgi-admin
     WSGIApplicationGroup %{GLOBAL}
     WSGIPassAuthorization On
     LimitRequestBody 114688
@@ -72,7 +72,7 @@
     </IfVersion>
 {%- include "apache/files/_log.conf" %}
 
-    <Directory /usr/local/bin>
+    <Directory /usr/bin>
         <IfVersion >= 2.4>
             Require all granted
         </IfVersion>
@@ -109,7 +109,7 @@
 
 </VirtualHost>
 
-Alias /identity /usr/local/bin/keystone-wsgi-public
+Alias /identity /usr/bin/keystone-wsgi-public
 <Location /identity>
     SetHandler wsgi-script
     Options +ExecCGI
@@ -119,7 +119,7 @@
     WSGIPassAuthorization On
 </Location>
 
-Alias /identity_admin /usr/local/bin/keystone-wsgi-admin
+Alias /identity_admin /usr/bin/keystone-wsgi-admin
 <Location /identity_admin>
     SetHandler wsgi-script
     Options +ExecCGI

keystone/meta/heka.yml

diff --git a/keystone/meta/heka.yml b/keystone/meta/heka.yml
index 05fa72e..7bf794a 100644
--- a/keystone/meta/heka.yml
+++ b/keystone/meta/heka.yml
@@ -1,4 +1,5 @@
-{%- if pillar.keystone.server is defined %}
+{%- from "keystone/map.jinja" import server with context %}
+{%- if server.get('enabled', False) %}
 log_collector:
   decoder:
     keystone: