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

Revert "Add support for GitPython and salt-ssh on FreeBSD masters"

Browse Source 
This reverts commit b03831c0b0.
This commit is contained in:
Brian Jackson 2015-07-20 17:05:56 -05:00
parent f9cb912a65
commit ed3ab22a13
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/defaults.yaml
View File

@ -18,7 +18,6 @@ salt:
salt_api: salt-api salt_api: salt-api
salt_ssh: salt-ssh salt_ssh: salt-ssh
python_git: python-git
python_cherrypy: python-cherrypy python_cherrypy: python-cherrypy
python_tornado: python-tornado python_tornado: python-tornado

3
salt/gitfs/gitpython.sls
View File

@ -8,7 +8,6 @@ GitPython:
{% else %} {% else %}
python-git: python-git:
pkg.installed: pkg.installed
- name: {{ salt_settings['python_git'] }}
{% endif %} {% endif %}

2
salt/map.jinja
View File

@ -48,8 +48,6 @@ that differ from whats in defaults.yaml
'salt_syndic': 'py27-salt', 'salt_syndic': 'py27-salt',
'salt_cloud': 'py27-salt', 'salt_cloud': 'py27-salt',
'salt_api': 'py27-salt', 'salt_api': 'py27-salt',
'salt_ssh': 'py27-salt',
'python_git': 'py27-GitPython',
'config_path': '/usr/local/etc/salt', 'config_path': '/usr/local/etc/salt',
'minion_service': 'salt_minion', 'minion_service': 'salt_minion',
'master_service': 'salt_master', 'master_service': 'salt_master',