Allow Skipping of service manipulation via pillar (+PR comments)

This commit is contained in:
Noel McLoughin 2017-11-03 16:59:12 +00:00
parent 185b98a38e
commit 77a7cbf228
2 changed files with 19 additions and 0 deletions

View File

@ -10,6 +10,8 @@ apache:
- name: {{ apache.user }} - name: {{ apache.user }}
- gid: {{ apache.group }} - gid: {{ apache.group }}
- system: True - system: True
{# By default run apache service states (unless pillar is false) #}
{% if salt['pillar.get']('apache:manage_service_states', True) %}
service.running: service.running:
- name: {{ apache.service }} - name: {{ apache.service }}
- enable: True - enable: True
@ -25,3 +27,17 @@ apache-restart:
module.wait: module.wait:
- name: service.restart - name: service.restart
- m_name: {{ apache.service }} - m_name: {{ apache.service }}
{% else %}
apache-reload:
test.show_notification:
- name: Skipping reload per user request
- text: Pillar manage_service_states is False
apache-restart:
test.show_notification:
- name: Skipping restart per user request
- text: Pillar manage_service_states is False
{% endif %}

View File

@ -1,6 +1,9 @@
# ``apache`` formula configuration: # ``apache`` formula configuration:
apache: apache:
# By default apache restart/reload states run (false skips)
manage_service_states: True
# lookup section overrides ``map.jinja`` values # lookup section overrides ``map.jinja`` values
lookup: lookup:
server: apache2 server: apache2