From e83ca81776e507b56625dd8a43a4fd4251f66061 Mon Sep 17 00:00:00 2001 From: Tristan PILAT Date: Tue, 24 Jul 2018 12:29:42 +0200 Subject: [PATCH] Haproxy role now handle haproxy installation from backports for Debian Stretch --- haproxy/README.md | 2 +- haproxy/defaults/main.yml | 2 +- haproxy/tasks/main.yml | 4 ++-- .../{packages_jessie_backports.yml => packages_backports.yml} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename haproxy/tasks/{packages_jessie_backports.yml => packages_backports.yml} (88%) diff --git a/haproxy/README.md b/haproxy/README.md index 9f597baa..54416827 100644 --- a/haproxy/README.md +++ b/haproxy/README.md @@ -8,7 +8,7 @@ Everything is in the `tasks/main.yml` file. ## Available variables -* `haproxy_jessie_backports` : on Debian Jessie, we can prefer v1.7 from backports (default: `False`) +* `haproxy_backports` : We can either prefer v1.7 from backports for Debian Jessie or v1.8 for Debian Stretch (default: `False`) ## Configuration templates diff --git a/haproxy/defaults/main.yml b/haproxy/defaults/main.yml index 31f054ab..f531a10a 100644 --- a/haproxy/defaults/main.yml +++ b/haproxy/defaults/main.yml @@ -1,3 +1,3 @@ --- -haproxy_jessie_backports: False +haproxy_backports: False haproxy_stats_url: "http://127.0.0.1:8080/" diff --git a/haproxy/tasks/main.yml b/haproxy/tasks/main.yml index 3d252a55..0c8cb1fe 100644 --- a/haproxy/tasks/main.yml +++ b/haproxy/tasks/main.yml @@ -7,8 +7,8 @@ - haproxy - packages -- include: packages_jessie_backports.yml - when: ansible_distribution_release == "jessie" and haproxy_jessie_backports +- include: packages_backports.yml + when: haproxy_backports - name: Install HAProxy package apt: diff --git a/haproxy/tasks/packages_jessie_backports.yml b/haproxy/tasks/packages_backports.yml similarity index 88% rename from haproxy/tasks/packages_jessie_backports.yml rename to haproxy/tasks/packages_backports.yml index 17218ee6..a5c33170 100644 --- a/haproxy/tasks/packages_jessie_backports.yml +++ b/haproxy/tasks/packages_backports.yml @@ -7,7 +7,7 @@ - haproxy - packages -- name: Prefer HAProxy package from jessie-backports +- name: Prefer HAProxy package from backports copy: src: haproxy_apt_preferences dest: /etc/apt/preferences.d/999-haproxy