Browse Source

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

This reverts commit b03831c0b0.
tags/v0.57.0
Brian Jackson 9 years ago
parent
commit
ed3ab22a13
3 changed files with 1 additions and 5 deletions
  1. +0
    -1
      salt/defaults.yaml
  2. +1
    -2
      salt/gitfs/gitpython.sls
  3. +0
    -2
      salt/map.jinja

+ 0
- 1
salt/defaults.yaml View File

@@ -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


+ 1
- 2
salt/gitfs/gitpython.sls View File

@@ -8,7 +8,6 @@ GitPython:
{% else %}

python-git:
pkg.installed:
- name: {{ salt_settings['python_git'] }}
pkg.installed

{% endif %}

+ 0
- 2
salt/map.jinja View File

@@ -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',

Loading…
Cancel
Save