commit e270bf3aa2503c199a082dea4caa44973df476c2
author Filip Pytloun <filip@pytloun.cz> Tue Jun 13 10:44:48 2017 +0200
committer GitHub <noreply@github.com> Tue Jun 13 10:44:48 2017 +0200
tree 4ac34f50d18be58d044873f5f1e4fce059900e44
parent 01f7710b6122899520888445355c6cea776263d6
parent cf9ae4ebfd27fcb944897512ebd239f7f30625e5

Merge pull request #16 from Martin819/master

Simplify 'noservices' condition

cinder/controller.sls

diff --git a/cinder/controller.sls b/cinder/controller.sls
index 4d8c334..2d3ed9d 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -59,9 +59,9 @@
   service.running:
   - name: apache2
   - enable: true
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: /etc/cinder/cinder.conf
     - file: /etc/cinder/api-paste.ini
@@ -73,9 +73,9 @@
   service.running:
   - name: cinder-api
   - enable: true
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: /etc/cinder/cinder.conf
     - file: /etc/cinder/api-paste.ini
@@ -98,9 +98,9 @@
   service.running:
   - names: {{ controller.services }}
   - enable: true
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: /etc/cinder/cinder.conf
     - file: /etc/cinder/api-paste.ini
@@ -108,9 +108,9 @@
 cinder_syncdb:
   cmd.run:
   - name: cinder-manage db sync
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - require:
     - service: cinder_controller_services
 

cinder/volume.sls

diff --git a/cinder/volume.sls b/cinder/volume.sls
index ee5d9ea..15faf0f 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -44,9 +44,9 @@
   service.running:
   - names: {{ volume.backup.services }}
   - enable: true
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: /etc/cinder/cinder.conf
     - file: /etc/cinder/api-paste.ini
@@ -59,9 +59,9 @@
   service.running:
   - names: {{ volume.services }}
   - enable: true
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: /etc/cinder/cinder.conf
     - file: /etc/cinder/api-paste.ini
@@ -96,9 +96,9 @@
     - iscsitarget
     - open-iscsi
   - enable: true
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: /etc/default/iscsitarget
 
@@ -182,9 +182,9 @@
     - iscsitarget
     - open-iscsi
   - enable: true
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: /etc/default/iscsitarget