diff --git a/salt/defaults.yaml b/salt/defaults.yaml index 511e7ec..4b4562c 100644 --- 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 index 5d90be8..7fa09ef 100644 --- 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 index 3643c18..9878a77 100644 --- 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',