saltstack-formulas/users-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #161 from qno/master

Browse Source 
corrected saltversioninfo check expression
This commit is contained in:
Niels Abspoel 2017-09-25 23:01:57 +02:00 committed by GitHub
commit a133ef1c8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
users/init.sls
View File

@ -462,7 +462,7 @@ users_googleauth-{{ svc }}-{{ name }}:
{% if 'gitconfig' in user %} {% if 'gitconfig' in user %}
{% for key, value in user['gitconfig'].items() %} {% for key, value in user['gitconfig'].items() %}
users_{{ name }}_user_gitconfig_{{ loop.index0 }}: users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
{% if grains['saltversioninfo'] >= (2015, 8, 0, 0) %} {% if grains['saltversioninfo'] >= [2015, 8, 0, 0] %}
git.config_set: git.config_set:
{% else %} {% else %}
git.config: git.config:
@ -470,7 +470,7 @@ users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
- name: {{ key }} - name: {{ key }}
- value: "{{ value }}" - value: "{{ value }}"
- user: {{ name }} - user: {{ name }}
{% if grains['saltversioninfo'] >= (2015, 8, 0, 0) %} {% if grains['saltversioninfo'] >= [2015, 8, 0, 0] %}
- global: True - global: True
{% else %} {% else %}
- is_global: True - is_global: True