diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls index 6679215e4..a64b9d90a 100644 --- a/salt/pcap/init.sls +++ b/salt/pcap/init.sls @@ -111,6 +111,7 @@ stenolog: so-steno: docker_container.{{ STENOOPTIONS.status }}: + {% if STENOOPTIONS.status == 'running' %} - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-steno:{{ VERSION }} - start: {{ STENOOPTIONS.start }} - network_mode: host @@ -126,6 +127,9 @@ so-steno: - /opt/so/log/stenographer:/var/log/stenographer:rw - watch: - file: /opt/so/conf/steno/config + {% else %} {# if stenographer isn't enabled, then stop and remove the container #} + - force: True + {% endif %} append_so-steno_so-status.conf: file.append: @@ -133,7 +137,6 @@ append_so-steno_so-status.conf: - text: so-steno - unless: grep -q so-steno /opt/so/conf/so-status/so-status.conf - {% if not STENOOPTIONS.start %} so-steno_so-status.disabled: file.comment: @@ -152,4 +155,4 @@ delete_so-steno_so-status.disabled: test.fail_without_changes: - name: {{sls}}_state_not_allowed -{% endif %} \ No newline at end of file +{% endif %} diff --git a/salt/pcap/map.jinja b/salt/pcap/map.jinja index b3c746bcc..ad23f763b 100644 --- a/salt/pcap/map.jinja +++ b/salt/pcap/map.jinja @@ -9,7 +9,7 @@ {% endif %} {% if ENABLED is sameas false %} - {% do STENOOPTIONS.update({'status': 'stopped'}) %} + {% do STENOOPTIONS.update({'status': 'absent'}) %} {% else %} {% do STENOOPTIONS.update({'status': 'running'}) %} -{% endif %} \ No newline at end of file +{% endif %}