Merge pull request #40 from davidkarlsen/noPpaForUbuntu

this is no longer needed - haproxy 1.5.x in ubuntu repo
2015-12-27 11:10:19 -08:00 · 2015-12-27 11:10:19 -08:00 · ff4a06b5b0
commit ff4a06b5b0
parent e1f9df1c1a 76b4e81af5
1 changed files with 1 additions and 12 deletions
--- 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