commit b9f688ab4a0892c5ebec2f7b73be2ada112a7271
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Mar 30 10:16:48 2018 +0000
committer Gerrit Code Review <gerrit2@7e698601da6d> Fri Mar 30 10:16:48 2018 +0000
tree 8ad80f34cc37b77ecaa3a9689de7e353ff699b77
parent 199c47ecdfdfe13e3e09c4433c11b6df58625322
parent ffb6f715bdb726e712a5d832c3ed756f82309d5e

Merge "Add manila module"

manila/api.sls

diff --git a/manila/api.sls b/manila/api.sls
index 2ab8acf..6f78c13 100644
--- a/manila/api.sls
+++ b/manila/api.sls
@@ -23,6 +23,10 @@
   - name: manila-api
   - enable: False
 
+manila_site_enabled:
+  apache_site.enabled:
+    - name: wsgi_manila
+
 {{ api.service }}:
   service.running:
     - enable: true
@@ -32,6 +36,9 @@
     {%- if grains.get('noservices') %}
     - onlyif: /bin/false
     {%- endif %}
+    - require:
+      - manila_api_service_dead
+      - manila_site_enabled
 
 /etc/manila/policy.json:
   file.managed:
@@ -40,8 +47,4 @@
   - require:
     - pkg: manila_api_packages
 
-manila_site_enabled:
-  apache_site.enabled:
-    - name: wsgi_manila
-
 {%- endif %}