Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

fix(minion): fix windows path construction

This commit is contained in:
Heinz Wiesinger 2021-12-27 14:37:24 +01:00
parent dfa7f7d1d8
commit c9c6e12223
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/minion.sls
View File

@ -78,7 +78,7 @@ salt-minion:
{%- endif %} {%- endif %}
{% endif %} {% endif %}
file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path | path_join('minion.d') }}
{%- if salt_settings.minion_config_use_TOFS %} {%- if salt_settings.minion_config_use_TOFS %}
- template: '' - template: ''
- source: {{ files_switch(['minion.d'], - source: {{ files_switch(['minion.d'],
@ -183,7 +183,7 @@ remove-default-minion-conf-file:
# clean up old _defaults.conf file if they have it around # clean up old _defaults.conf file if they have it around
remove-old-minion-conf-file: remove-old-minion-conf-file:
file.absent: file.absent:
- name: {{ salt_settings.config_path }}/minion.d/_defaults.conf - name: {{ salt_settings.config_path | path_join('minion.d', '_defaults.conf') }}
{% if grains.os == 'MacOS' %} {% if grains.os == 'MacOS' %}
remove-macpackage-salt: remove-macpackage-salt: