Merge pull request #150 from pcdummy/master

Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.

README.rst

@@ -46,6 +46,7 @@ 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``
 -------------------

salt/api.sls

@@ -1,16 +1,47 @@
+#!jinja|yaml
+
 {% from "salt/map.jinja" import salt_settings with context %}
 
 include:
   - salt.master
+  - pip.extensions
 
-salt-api:
+{%- set cfg_salt = pillar.get('salt', {}) %}
-{% if salt_settings.install_packages %}
+{%- set cfg_master = cfg_salt.get('master', {}) %}
+
+salt_api_install:
   pkg.installed:
-    - name: {{ salt_settings.salt_api }}
+    - name: {{ salt_settings['salt_api'] }}
-{% endif %}
   service.running:
-    - name: {{ salt_settings.api_service }}
+    - name: {{ salt_settings.get('api_service', 'salt-api') }}
     - require:
-      - service: {{ salt_settings.master_service }}
+{%- if 'rest_cherrypy' in cfg_master %}
+      - pip: salt_api_cherrypy
+{% elif 'rest_tornado' in cfg_master %}
+      - pip: salt_api_tornado
+{% endif %}
     - watch:
       - pkg: salt-master
+      - file: salt-master
+
+{%- 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 %}

salt/defaults.yaml

@@ -18,6 +18,9 @@ salt:
   salt_api: salt-api
   salt_ssh: salt-ssh
 
+  python-cherrypy: python-cherrypy
+  python-tornado: python-tornado
+
   master:
     gitfs_provider: gitpython