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

Issue 361
2018-04-05 12:42:22 +02:00 · 2018-04-05 12:42:22 +02:00 · dd731c643a
commit dd731c643a
parent 9a81ab2f9b d40d869883
2 changed files with 7 additions and 0 deletions
--- a/salt/gitfs/gitpython.sls
+++ b/salt/gitfs/gitpython.sls
@ -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 %}
--- a/salt/map.jinja
+++ b/salt/map.jinja
@ -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': {