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

This reverts commit b03831c.
1Q1 · Jul 20, 2015 · ed3ab22 · ed3ab22
1 parent f9cb912
commit ed3ab22
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/salt/defaults.yaml b/salt/defaults.yaml
@@ -18,7 +18,6 @@ salt:
   salt_api: salt-api
   salt_ssh: salt-ssh
 
-  python_git: python-git
   python_cherrypy: python-cherrypy
   python_tornado: python-tornado
 

diff --git a/salt/gitfs/gitpython.sls b/salt/gitfs/gitpython.sls
@@ -8,7 +8,6 @@ GitPython:
 {% else %}
 
 python-git:
-  pkg.installed:
-    - name: {{ salt_settings['python_git'] }}
+  pkg.installed
 
 {% endif %}
diff --git a/salt/map.jinja b/salt/map.jinja
@@ -48,8 +48,6 @@ that differ from whats in defaults.yaml
       'salt_syndic': 'py27-salt',
       'salt_cloud': 'py27-salt',
       'salt_api': 'py27-salt',
-      'salt_ssh': 'py27-salt',
-      'python_git': 'py27-GitPython',
       'config_path': '/usr/local/etc/salt',
       'minion_service': 'salt_minion',
       'master_service': 'salt_master',