Merge pull request #362 from colin-stubbs/issue-361

Issue 361
This commit is contained in:
Niels Abspoel
2018-04-05 12:42:22 +02:00
committed by GitHub
2 changed files with 7 additions and 0 deletions
+4
View File
@@ -1,5 +1,7 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% if 'gitfs' in salt_settings and 'gitpython' in salt_settings.gitfs %}
{% if salt_settings.gitfs.gitpython.install_from_source %}
GitPython:
@@ -12,3 +14,5 @@ python-git:
- name: {{ salt_settings.python_git }}
{% endif %}
{% endif %}
+3
View File
@@ -71,6 +71,9 @@ that differ from whats in defaults.yaml
}, grain='os'),
'python_git': 'GitPython',
'gitfs': {
'gitpython': {
'install_from_source': False,
},
'pygit2': {
'install_from_source': False,
'git': {