Merge pull request #156 from iggy/revert_bad

Revert bad

README.rst

@@ -46,7 +46,6 @@ Configure pillar data under salt:ssh_roster to feed the template.
 
 Install salt api
 Requisite: Configure salt-master with rest_cherrypy or rest_tornado.
-Requires: pip.extensions as it installs the latest version from pip.
 
 ``salt.standalone``
 -------------------

pillar.example

@@ -38,10 +38,6 @@ salt:
       debug: False
       disable_ssl: False
 
-  api:
-    # Installs the latest version of cherrpy/tornado from pip.
-    use_pip: True
-
   # salt minion config:
   minion:
 

salt/api.sls

@@ -1,74 +1,16 @@
-#!jinja|yaml
-
 {% from "salt/map.jinja" import salt_settings with context %}
 
-{%- set cfg_salt = pillar.get('salt', {}) %}
-{%- set cfg_master = cfg_salt.get('master', {}) %}
-{%- set use_pip = salt['pillar.get']('salt:api:use_pip', False) %}
-
 include:
   - salt.master
-{%- if use_pip %}
-  - pip.extensions
-{%- endif %}
 
-salt_api_install:
+salt-api:
+{% if salt_settings.install_packages %}
   pkg.installed:
-    - name: {{ salt_settings['salt_api'] }}
+    - name: {{ salt_settings.salt_api }}
+{% endif %}
   service.running:
-    - name: {{ salt_settings.get('api_service', 'salt-api') }}
+    - name: {{ salt_settings.api_service }}
     - require:
-{%- if use_pip %}
-{%- if 'rest_cherrypy' in cfg_master %}
-      - pip: salt_api_cherrypy
-{%- elif 'rest_tornado' in cfg_master %}
-      - pip: salt_api_tornado
-{%- endif %}
-{%- else %} # if use_pip
-{%- if 'rest_cherrypy' in cfg_master %}
-      - pkg: salt_api_cherrypy
-{%- elif 'rest_tornado' in cfg_master %}
-      - pkg: salt_api_tornado
-{%- endif %}
-{%- endif %}
+      - service: {{ salt_settings.master_service }}
     - watch:
       - pkg: salt-master
-      - file: salt-master
-
-{%- if use_pip %}
-{%- if 'rest_cherrypy' in cfg_master %}
-salt_api_cherrypy:
-  pkg.purged:
-    - name: {{ salt_settings.python_cherrypy }}
-  pip.installed:
-    - name: cherrypy
-    - require:
-      - pkg: salt_api_cherrypy
-      - pkg: pip_extensions
-{% endif %}
-
-{%- if 'rest_tornado' in cfg_master %}
-salt_api_tornado:
-  pkg.purged:
-    - name: {{ salt_settings.python_tornado }}
-  pip.installed:
-    - name: tornado
-    - require:
-      - pkg: salt_api_tornado
-      - pkg: pip_extensions
-{% endif %}
-
-{%- else %} # if use_pip
-
-{% if 'rest_cherrypy' in cfg_master %}
-salt_api_cherrypy:
-  pkg.installed:
-    - name: {{ salt_settings.python_cherrypy }}
-{% endif %}
-
-{% if 'rest_tornado' in cfg_master %}
-salt_api_tornado:
-  pkg.installed:
-    - name: {{ salt_settings.python_tornado }}
-{% endif %}
-{%- endif %}

salt/defaults.yaml

@@ -18,10 +18,6 @@ salt:
   salt_api: salt-api
   salt_ssh: salt-ssh
 
-  python_git: python-git
-  python_cherrypy: python-cherrypy
-  python_tornado: python-tornado
-
   master:
     gitfs_provider: gitpython
 

salt/gitfs/gitpython.sls

@@ -8,7 +8,6 @@ GitPython:
 {% else %}
 
 python-git:
-  pkg.installed:
-    - name: {{ salt_settings.python_git }}
+  pkg.installed
 
 {% endif %}

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