Merge pull request #40 from davidkarlsen/noPpaForUbuntu

this is no longer needed - haproxy 1.5.x in ubuntu repo

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 %}
+{% endif %}