alanorth/ansible-personal
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

roles/common: Only add extras repo on Ubuntu 14.04

Browse Source 
The Extras repo was discontinued after 14.10 (but the latest we
deploy is 14.04).

See: https://lists.ubuntu.com/archives/technical-board/2015-January/002063.html

Signed-off-by: Alan Orth <alan.orth@gmail.com>
This commit is contained in:
Alan Orth 2015-06-01 14:01:56 +03:00
parent e84f777a6b
commit 9aaad366f5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/common/tasks/packages_Ubuntu.yml
View File

@ -4,6 +4,7 @@
- name: Add GPG key for Extras repo - name: Add GPG key for Extras repo
apt_key: id=0x3E5C1192 url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x16126D3A3E5C1192 state=present apt_key: id=0x3E5C1192 url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x16126D3A3E5C1192 state=present
when: ansible_distribution_version == '14.04'
- name: Upgrade base OS - name: Upgrade base OS
apt: upgrade=dist update_cache=yes apt: upgrade=dist update_cache=yes

3
roles/common/templates/sources.list.j2
View File

@ -14,5 +14,8 @@ deb http://{{ apt_mirror }}/ubuntu/ {{ ansible_distribution_release }}-updates m
###### Ubuntu Partner Repo ###### Ubuntu Partner Repo
deb http://archive.canonical.com/ubuntu {{ ansible_distribution_release }} partner deb http://archive.canonical.com/ubuntu {{ ansible_distribution_release }} partner
{% if ansible_distribution_version == '14.04' %}
{# extras repo was discontinued after 14.10, but the latest we deploy is 14.04 #}
###### Ubuntu Extras Repo ###### Ubuntu Extras Repo
deb http://extras.ubuntu.com/ubuntu {{ ansible_distribution_release }} main deb http://extras.ubuntu.com/ubuntu {{ ansible_distribution_release }} main
{% endif %}