Optimize 'noservices' condition
Change-Id: I1864b1a04eca2690af8c2c932b2ed12e04a0aade
diff --git a/telegraf/agent.sls b/telegraf/agent.sls
index 9ac49d7..086e517 100644
--- a/telegraf/agent.sls
+++ b/telegraf/agent.sls
@@ -32,10 +32,8 @@
- template: jinja
- require:
- pkg: telegraf_packages_agent
- {%- if not grains.get('noservices', False)%}
- watch_in:
- service: telegraf_service_agent
- {%- endif %}
- defaults:
name: {{ name }}
values: {{ values }}
@@ -56,10 +54,8 @@
- name: {{ agent.dir.config_d }}/input-{{ name }}.conf
- require:
- pkg: telegraf_packages_agent
- {%- if not grains.get('noservices', False)%}
- watch_in:
- service: telegraf_service_agent
- {%- endif %}
{%- endif %}
{%- endfor %}
@@ -76,25 +72,22 @@
- template: jinja
- require:
- pkg: telegraf_packages_agent
- {%- if not grains.get('noservices', False)%}
- watch_in:
- service: telegraf_service_agent
- {%- endif %}
- defaults:
name: {{ name }}
values: {{ values }}
{%- endfor %}
-{%- if not grains.get('noservices', False)%}
-
telegraf_service_agent:
service.running:
- name: telegraf
- enable: True
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- watch:
- file: telegraf_config_agent
{%- endif %}
-
-{%- endif %}