saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

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

Browse Source 
Issue 361
This commit is contained in:
Niels Abspoel 2018-04-05 12:42:22 +02:00 committed by GitHub
commit dd731c643a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/gitfs/gitpython.sls
View File

@ -1,5 +1,7 @@
{% from "salt/map.jinja" import salt_settings with context %} {% 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 %} {% if salt_settings.gitfs.gitpython.install_from_source %}
GitPython: GitPython:
@ -12,3 +14,5 @@ python-git:
- name: {{ salt_settings.python_git }} - name: {{ salt_settings.python_git }}
{% endif %} {% endif %}
{% endif %}

3
salt/map.jinja
View File

@ -71,6 +71,9 @@ that differ from whats in defaults.yaml
}, grain='os'), }, grain='os'),
'python_git': 'GitPython', 'python_git': 'GitPython',
'gitfs': { 'gitfs': {
'gitpython': {
'install_from_source': False,
},
'pygit2': { 'pygit2': {
'install_from_source': False, 'install_from_source': False,
'git': { 'git': {