From d216a3f651287856e7f5e8720bb46b6709dc3673 Mon Sep 17 00:00:00 2001
From: Brian Jackson <iggy@theiggy.com>
Date: Mon, 20 Jul 2015 17:05:56 -0500
Subject: [PATCH] Revert "Install cherrypy/tornado from pip only if use_pip is
 True."

This reverts commit 90282eff03847713936dd85045a3aa48c99e892c.
---
 pillar.example     |  4 ----
 salt/api.sls       | 55 ++++++++++------------------------------------
 salt/defaults.yaml |  4 ++--
 3 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/pillar.example b/pillar.example
index 8d06db4..614cc7d 100644
--- a/pillar.example
+++ b/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:
 
diff --git a/salt/api.sls b/salt/api.sls
index 3314a26..9c1fa13 100644
--- a/salt/api.sls
+++ b/salt/api.sls
@@ -2,15 +2,12 @@
 
 {% 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 %}
+
+{%- set cfg_salt = pillar.get('salt', {}) %}
+{%- set cfg_master = cfg_salt.get('master', {}) %}
 
 salt_api_install:
   pkg.installed:
@@ -18,31 +15,20 @@ salt_api_install:
   service.running:
     - name: {{ salt_settings.get('api_service', 'salt-api') }}
     - require:
-{%- if use_pip %}
 {%- if 'rest_cherrypy' in cfg_master %}
       - pip: salt_api_cherrypy
-{%- elif 'rest_tornado' in cfg_master %}
+{% 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 %}
+{% endif %}
     - 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
+  pkg.purged:
+    - name: {{ salt_settings['python-cherrypy'] }}
+  pip.installed:
     - name: cherrypy
     - require:
       - pkg: salt_api_cherrypy
@@ -51,30 +37,11 @@ salt_api_cherrypy:
 
 {%- if 'rest_tornado' in cfg_master %}
 salt_api_tornado:
-  pkg:
-    - purged
-    - name: {{ salt_settings['python_tornado'] }}
-  pip:
-    - installed
+  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 %}
diff --git a/salt/defaults.yaml b/salt/defaults.yaml
index 4b4562c..2c61f12 100644
--- a/salt/defaults.yaml
+++ b/salt/defaults.yaml
@@ -18,8 +18,8 @@ salt:
   salt_api: salt-api
   salt_ssh: salt-ssh
 
-  python_cherrypy: python-cherrypy
-  python_tornado: python-tornado
+  python-cherrypy: python-cherrypy
+  python-tornado: python-tornado
 
   master:
     gitfs_provider: gitpython