From e5708bec8e44ce7a5a3e04132d39e8f543b2be31 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Wed, 3 Jun 2015 15:22:14 -0700 Subject: [PATCH] Allow for building non-wheezy releases This makes the kernel update task only happen on wheezy and removes the default release stuff from bird (the newer backports version should be installed without pinning to that repo) Change-Id: Id4b997848edee21bdcfa3d9defedc69598eccfad --- ansible/main.yml | 2 +- ansible/tasks/bird.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/main.yml b/ansible/main.yml index 9cd8639..8e542e1 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -17,7 +17,7 @@ - include: tasks/debian_backports.yml when: ansible_distribution == "Debian" and ansible_distribution_release == "wheezy" - include: tasks/update_kernel.yml - when: update_kernel + when: update_kernel and ansible_distribution_release == "wheezy" - include: tasks/base.yml - include: tasks/akanda.yml - include: tasks/bird.yml diff --git a/ansible/tasks/bird.yml b/ansible/tasks/bird.yml index db5e17b..a9258f6 100644 --- a/ansible/tasks/bird.yml +++ b/ansible/tasks/bird.yml @@ -1,11 +1,11 @@ --- - name: install bird - apt: name=bird state=installed install_recommends=no default_release=wheezy-backports + apt: name=bird state=installed install_recommends=no when: bird_enable - name: install bird6 - apt: name=bird6 state=installed install_recommends=no default_release=wheezy-backports + apt: name=bird6 state=installed install_recommends=no when: bird6_enable # Debian version does not support status ensure that it exists