Resolve git.config error where minion does not have Git installed #115

This commit is contained in:
Imran Iqbal 2016-06-09 09:13:32 +01:00
parent 0ab6e3d12b
commit 846634bfd7
2 changed files with 9 additions and 0 deletions

View File

@ -81,6 +81,9 @@ users:
options: options:
- "StrictHostKeyChecking yes" - "StrictHostKeyChecking yes"
# Using gitconfig without Git installed will result in an error
# https://docs.saltstack.com/en/latest/ref/states/all/salt.states.git.html:
# This state module now requires git 1.6.5 (released 10 October 2009) or newer.
gitconfig: gitconfig:
user.name: B User user.name: B User
user.email: buser@example.com user.email: buser@example.com

View File

@ -416,6 +416,11 @@ users_googleauth-{{ svc }}-{{ name }}:
{%- endif %} {%- endif %}
{% if 'gitconfig' in user %} {% if 'gitconfig' in user %}
{% if not salt['cmd.has_exec']('git') %}
skip_{{ name }}_gitconfig_since_git_not_installed:
test.fail_without_changes:
- name: "Git configuration for user {{ name }} has been skipped because Git is not installed."
{% else %}
{% 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) %}
@ -433,6 +438,7 @@ users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endif %}
{% endfor %} {% endfor %}