From ef73e4ce98a7e3832fa3d06172f8cd30d6ff393e Mon Sep 17 00:00:00 2001
From: Brian Jackson <iggy@theiggy.com>
Date: Mon, 20 Jul 2015 17:05:54 -0500
Subject: [PATCH 1/7] Revert "Change variable lookup to match usage in other
 states"

This reverts commit 14b466e02216a1d08ae31c3b86b9019e1ea0360b.
---
 salt/gitfs/gitpython.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/gitfs/gitpython.sls b/salt/gitfs/gitpython.sls
index f1a48e6..5d90be8 100644
--- a/salt/gitfs/gitpython.sls
+++ b/salt/gitfs/gitpython.sls
@@ -9,6 +9,6 @@ GitPython:
 
 python-git:
   pkg.installed:
-    - name: {{ salt_settings.python_git }}
+    - name: {{ salt_settings['python_git'] }}
 
 {% endif %}

From f9cb912a65ab2a252ee0a9c94e271b4633abcba2 Mon Sep 17 00:00:00 2001
From: Brian Jackson <iggy@theiggy.com>
Date: Mon, 20 Jul 2015 17:05:56 -0500
Subject: [PATCH 2/7] Revert "salt.api state fails"

This reverts commit 22b8dde1ff21acf97cd30fe197d20d451246b5ae.
---
 salt/api.sls | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/salt/api.sls b/salt/api.sls
index d4f0df8..a017e3c 100644
--- a/salt/api.sls
+++ b/salt/api.sls
@@ -38,9 +38,9 @@ salt_api_install:
 {%- if use_pip %}
 {%- if 'rest_cherrypy' in cfg_master %}
 salt_api_cherrypy:
-  pkg.purged:
+  pkg.purged
     - name: {{ salt_settings.python_cherrypy }}
-  pip.installed:
+  pip.installed
     - name: cherrypy
     - require:
       - pkg: salt_api_cherrypy
@@ -49,9 +49,9 @@ salt_api_cherrypy:
 
 {%- if 'rest_tornado' in cfg_master %}
 salt_api_tornado:
-  pkg.purged:
+  pkg.purged
     - name: {{ salt_settings.python_tornado }}
-  pip.installed:
+  pip.installed
     - name: tornado
     - require:
       - pkg: salt_api_tornado
@@ -62,13 +62,13 @@ salt_api_tornado:
 
 {% if 'rest_cherrypy' in cfg_master %}
 salt_api_cherrypy:
-  pkg.installed:
+  pkg.installed
     - name: {{ salt_settings.python_cherrypy }}
 {% endif %}
 
 {% if 'rest_tornado' in cfg_master %}
 salt_api_tornado:
-  pkg.installed:
+  pkg.installed
     - name: {{ salt_settings.python_tornado }}
 {% endif %}
 {%- endif %}

From ed3ab22a13336f5b90189999407f01710a1c9830 Mon Sep 17 00:00:00 2001
From: Brian Jackson <iggy@theiggy.com>
Date: Mon, 20 Jul 2015 17:05:56 -0500
Subject: [PATCH 3/7] Revert "Add support for GitPython and salt-ssh on FreeBSD
 masters"

This reverts commit b03831c0b05ce3c376ebd150cf436dca2d80f090.
---
 salt/defaults.yaml       | 1 -
 salt/gitfs/gitpython.sls | 3 +--
 salt/map.jinja           | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

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

From 8448aa40211ef8f0b20a0a51d87a510eae68d05e Mon Sep 17 00:00:00 2001
From: Brian Jackson <iggy@theiggy.com>
Date: Mon, 20 Jul 2015 17:05:56 -0500
Subject: [PATCH 4/7] Revert "Fix stuff suggested by @iggy."

This reverts commit c5ae289fa1210551986fbc6d959c3127e00011be.
---
 salt/api.sls | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/salt/api.sls b/salt/api.sls
index a017e3c..3314a26 100644
--- a/salt/api.sls
+++ b/salt/api.sls
@@ -38,9 +38,11 @@ salt_api_install:
 {%- 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
@@ -49,9 +51,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
@@ -62,13 +66,15 @@ salt_api_tornado:
 
 {% if 'rest_cherrypy' in cfg_master %}
 salt_api_cherrypy:
-  pkg.installed
-    - name: {{ salt_settings.python_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 }}
+  pkg:
+    - installed
+    - name: {{ salt_settings['python_tornado'] }}
 {% endif %}
 {%- endif %}

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 5/7] 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

From 6e98d508c46fe08f1cbfe5e09c78f914c9d86b5f Mon Sep 17 00:00:00 2001
From: Brian Jackson <iggy@theiggy.com>
Date: Mon, 20 Jul 2015 17:05:57 -0500
Subject: [PATCH 6/7] Revert "Fix salt/api.sls."

This reverts commit 8a1b8dc9db3781b46db1000205802fc864ba75cf.
---
 salt/api.sls | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/salt/api.sls b/salt/api.sls
index 9c1fa13..820c349 100644
--- a/salt/api.sls
+++ b/salt/api.sls
@@ -9,39 +9,40 @@ include:
 {%- set cfg_salt = pillar.get('salt', {}) %}
 {%- set cfg_master = cfg_salt.get('master', {}) %}
 
-salt_api_install:
+salt-api:
   pkg.installed:
-    - name: {{ salt_settings['salt_api'] }}
+    - name: {{ salt_settings['salt-api'] }}
   service.running:
     - name: {{ salt_settings.get('api_service', 'salt-api') }}
     - require:
+      - service: {{ salt_settings.get('api_service', 'salt-api') }}
 {%- if 'rest_cherrypy' in cfg_master %}
-      - pip: salt_api_cherrypy
+      - pip: salt-api-cherrypy
 {% elif 'rest_tornado' in cfg_master %}
-      - pip: salt_api_tornado
+      - pip: salt-api-tornado
 {% endif %}
     - watch:
       - pkg: salt-master
       - file: salt-master
 
 {%- if 'rest_cherrypy' in cfg_master %}
-salt_api_cherrypy:
+salt-api-cherrypy:
   pkg.purged:
     - name: {{ salt_settings['python-cherrypy'] }}
   pip.installed:
     - name: cherrypy
     - require:
-      - pkg: salt_api_cherrypy
+      - pkg: salt-api-cherrypy
       - pkg: pip_extensions
 {% endif %}
 
 {%- if 'rest_tornado' in cfg_master %}
-salt_api_tornado:
+salt-api-tornado:
   pkg.purged:
     - name: {{ salt_settings['python-tornado'] }}
   pip.installed:
     - name: tornado
     - require:
-      - pkg: salt_api_tornado
+      - pkg: salt-api-tornado
       - pkg: pip_extensions
 {% endif %}

From 4c1f57792a23df6e4cd17cca72ed91004678aa32 Mon Sep 17 00:00:00 2001
From: Brian Jackson <iggy@theiggy.com>
Date: Mon, 20 Jul 2015 17:05:57 -0500
Subject: [PATCH 7/7] Revert "Advance sal/api.sls, install rest_cherrypy or
 rest_tornado from pip."

This reverts commit 7bb82b0178cb4024a0e6c9b65de0a8c0f07d6297.
---
 README.rst         |  1 -
 salt/api.sls       | 44 ++++++--------------------------------------
 salt/defaults.yaml |  3 ---
 3 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/README.rst b/README.rst
index 07e887c..6706b4c 100644
--- a/README.rst
+++ b/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``
 -------------------
diff --git a/salt/api.sls b/salt/api.sls
index 820c349..812f243 100644
--- a/salt/api.sls
+++ b/salt/api.sls
@@ -1,48 +1,16 @@
-#!jinja|yaml
-
 {% from "salt/map.jinja" import salt_settings with context %}
 
 include:
   - salt.master
-  - pip.extensions
-
-{%- set cfg_salt = pillar.get('salt', {}) %}
-{%- set cfg_master = cfg_salt.get('master', {}) %}
 
 salt-api:
+{% if salt_settings.install_packages %}
   pkg.installed:
-    - name: {{ salt_settings['salt-api'] }}
-  service.running:
-    - name: {{ salt_settings.get('api_service', 'salt-api') }}
-    - require:
-      - service: {{ salt_settings.get('api_service', 'salt-api') }}
-{%- if 'rest_cherrypy' in cfg_master %}
-      - pip: salt-api-cherrypy
-{% elif 'rest_tornado' in cfg_master %}
-      - pip: salt-api-tornado
+    - name: {{ salt_settings.salt_api }}
 {% endif %}
+  service.running:
+    - name: {{ salt_settings.api_service }}
+    - require:
+      - service: {{ salt_settings.master_service }}
     - 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 %}
diff --git a/salt/defaults.yaml b/salt/defaults.yaml
index 2c61f12..de663e1 100644
--- a/salt/defaults.yaml
+++ b/salt/defaults.yaml
@@ -18,9 +18,6 @@ salt:
   salt_api: salt-api
   salt_ssh: salt-ssh
 
-  python-cherrypy: python-cherrypy
-  python-tornado: python-tornado
-
   master:
     gitfs_provider: gitpython