Browse Source

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

This reverts commit b03831c0b0.
master
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

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



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

{% else %} {% else %}


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


{% endif %} {% endif %}

+ 0
- 2
salt/map.jinja View File

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

Loading…
Cancel
Save