From 76b4e81af56951226a4320eeb0d854186deceee5 Mon Sep 17 00:00:00 2001
From: david <david@davidkarlsen.com>
Date: Sun, 27 Dec 2015 19:51:14 +0100
Subject: [PATCH] this is no longer needed - haproxy 1.5.x in ubuntu repo

---
 haproxy/install.sls | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/haproxy/install.sls b/haproxy/install.sls
index bb56d80..736320f 100644
--- a/haproxy/install.sls
+++ b/haproxy/install.sls
@@ -1,14 +1,3 @@
-# Because on Ubuntu we don't have a current HAProxy in the usual repo, we add a PPA
-{% if salt['grains.get']('osfullname') == 'Ubuntu' %}
-haproxy_ppa_repo:
-  pkgrepo.managed:
-    - ppa: vbernat/haproxy-1.5
-    - require_in:
-      - pkg: haproxy.install
-    - watch_in:
-      - pkg: haproxy.install
-{% endif %}
-
 haproxy.install:
   pkg.installed:
     - name: haproxy
@@ -17,4 +6,4 @@ haproxy.install:
 {% for item in salt['pillar.get']('haproxy:require') %}
       - {{ item }}
 {% endfor %}
-{% endif %}
\ No newline at end of file
+{% endif %}