Optimize 'noservices' condition
diff --git a/heat/server.sls b/heat/server.sls
index ef42efe..b821e82 100644
--- a/heat/server.sls
+++ b/heat/server.sls
@@ -95,11 +95,12 @@
{%- endif %}
-{%- if not grains.get('noservices', False) %}
-
heat_syncdb:
cmd.run:
- name: heat-manage db_sync
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- require:
- file: /etc/heat/heat.conf
- pkg: heat_server_packages
@@ -107,6 +108,9 @@
heat_log_access:
cmd.run:
- name: chown heat:heat /var/log/heat/ -R
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- require:
- file: /etc/heat/heat.conf
- pkg: heat_server_packages
@@ -117,6 +121,9 @@
service.running:
- names: {{ server.services }}
- enable: true
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- require:
- cmd: heat_syncdb
- watch:
@@ -124,5 +131,3 @@
- file: /etc/heat/api-paste.ini
{%- endif %}
-
-{%- endif %}