commit 18ec810d98473761c0737db5fbd1ef400b65dc76
author Jakub Pavlik <pavlk.jakub@gmail.com> Tue Apr 11 09:36:49 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Tue Apr 11 09:36:50 2017 +0000
tree 71d893e33a038eb330a5f0ed5205837836bb937f
parent bb4e8f4fb3cca3bb8c42633be4bdbbb11f827358
parent 073eb6846f2107c65ba6d743e51f55f84abdd90e

Merge "remove wsgi keystone config files"

keystone/server.sls

diff --git a/keystone/server.sls b/keystone/server.sls
index eb08cdc..9881c66 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -6,6 +6,20 @@
   - names: {{ server.pkgs }}
 
 {%- if server.service_name in ['apache2', 'httpd'] %}
+/etc/apache2/sites-available/wsgi-keystone.conf:
+  file.absent:
+    {%- if not grains.get('noservices', False) %}
+    - watch_in:
+      - service: keystone_service
+    {%- endif %}
+
+/etc/apache2/sites-enabled/wsgi-keystone.conf:
+  file.absent:
+    {%- if not grains.get('noservices', False) %}
+    - watch_in:
+      - service: keystone_service
+    {%- endif %}
+
 include:
 - apache