fixing includes

This commit is contained in:
2020-07-21 18:38:38 +02:00
parent 2337286379
commit 8217cb639d

View File

@@ -4,15 +4,19 @@ set has_promexporter = salt['pillar.get'](
default={} default={}
) )
%} %}
{% set orig_prom_path = '/var/lib/prometheus/node-exporter' %} {% set orig_prom_path = '/var/lib/prometheus/node-exporter' %}
# This has to be here, otherwise:
{%- if 'prometheus-node_exporter' in has_promexporter %} # https://stackoverflow.com/questions/59268721/saltstack-use-include-twice-in-one-sls-file
#
include: include:
{%- if 'prometheus-node_exporter' in has_promexporter %}
- prometheus - prometheus
- systemd.reload - systemd.reload
{%- else %}
- prometheus.clean
{%- endif %}
{%- if 'prometheus-node_exporter' in has_promexporter %}
systemd-prometheus-node-exporter-service-override: systemd-prometheus-node-exporter-service-override:
file.managed: file.managed:
- name: /etc/systemd/system/prometheus-node-exporter.service.d/override.conf - name: /etc/systemd/system/prometheus-node-exporter.service.d/override.conf
@@ -45,8 +49,4 @@ patch-smartmon.sh:
- name: /usr/share/prometheus-node-exporter/smartmon.sh - name: /usr/share/prometheus-node-exporter/smartmon.sh
- source: salt://base/packages/prometheus/files/smartmon.sh - source: salt://base/packages/prometheus/files/smartmon.sh
- mode: 0755 - mode: 0755
{%- else %}
include:
- prometheus.clean
{%- endif %} {%- endif %}