Merge pull request #154 from irtnog/add-freebsd-support-saltssh-gitpython

Add support for GitPython and salt-ssh on FreeBSD masters
This commit is contained in:
puneet kandhari committed 2015-07-14 06:43:03 -07:00
commit b04fc8c843
3 files changed
+5 -1

No files matched your search

+1
View File
@@ -18,6 +18,7 @@ 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
+2 -1
View File
@@ -8,6 +8,7 @@ GitPython:
{% else %} {% else %}
python-git: python-git:
pkg.installed pkg.installed:
- name: {{ salt_settings.python_git }}
{% endif %} {% endif %}
+2
View File
@@ -48,6 +48,8 @@ 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',