openstack
/
astara-appliance
Code Issues Proposed changes

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
This commit is contained in:
Adam Gandelman 2015-06-03 15:22:14 -07:00
parent a12136b203
commit e5708bec8e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/main.yml
View File

@ -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

4
ansible/tasks/bird.yml
View File

@ -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