roles/common: Remove Ubuntu 14.04 logic
We're only supporting Ubuntu 16.04 now.
This commit is contained in:
parent
cef1655c40
commit
5f8820bf9f
@ -1,21 +1,4 @@
|
|||||||
---
|
---
|
||||||
- name: Install iptables-persistent
|
|
||||||
when: ansible_distribution_version | version_compare('14.04', '==')
|
|
||||||
apt: pkg=iptables-persistent update_cache=yes
|
|
||||||
tags: packages
|
|
||||||
|
|
||||||
- name: Copy /etc/iptables/rules.v4
|
|
||||||
when: ansible_distribution_version | version_compare('14.04', '==')
|
|
||||||
template: src=iptables.j2 dest=/etc/iptables/rules.v4 owner=root mode=0600
|
|
||||||
notify:
|
|
||||||
- restart iptables-persistent
|
|
||||||
|
|
||||||
- name: Copy /etc/iptables/rules.v6
|
|
||||||
when: ansible_distribution_version | version_compare('14.04', '==')
|
|
||||||
template: src=ip6tables.j2 dest=/etc/iptables/rules.v6 owner=root group=root mode=0600
|
|
||||||
notify:
|
|
||||||
- restart iptables-persistent
|
|
||||||
|
|
||||||
- name: Install firewalld and deps
|
- name: Install firewalld and deps
|
||||||
when: ansible_distribution_version | version_compare('15.04', '>=')
|
when: ansible_distribution_version | version_compare('15.04', '>=')
|
||||||
apt: pkg={{ item }} state=latest
|
apt: pkg={{ item }} state=latest
|
||||||
|
@ -3,10 +3,6 @@
|
|||||||
template: src=sources.list.j2 dest=/etc/apt/sources.list owner=root group=root mode=0644
|
template: src=sources.list.j2 dest=/etc/apt/sources.list owner=root group=root mode=0644
|
||||||
when: ansible_architecture != 'armv7l'
|
when: ansible_architecture != 'armv7l'
|
||||||
|
|
||||||
- name: Add GPG key for Extras repo
|
|
||||||
apt_key: id=0xC47415DFF48C09645B78609416126D3A3E5C1192 url=https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xC47415DFF48C09645B78609416126D3A3E5C1192 state=present
|
|
||||||
when: ansible_distribution_version | version_compare('14.04', '==')
|
|
||||||
|
|
||||||
- name: Upgrade base OS
|
- name: Upgrade base OS
|
||||||
apt: upgrade=dist update_cache=yes
|
apt: upgrade=dist update_cache=yes
|
||||||
|
|
||||||
|
@ -15,11 +15,6 @@ 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 | version_compare('14.04', '==') %}
|
|
||||||
{# extras repo was discontinued after 14.10, but the latest we deploy is 14.04 #}
|
|
||||||
###### Ubuntu Extras Repo
|
|
||||||
deb http://extras.ubuntu.com/ubuntu {{ ansible_distribution_release }} main
|
|
||||||
{% endif %}
|
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set apt_mirror = apt_mirror | default('httpredir.debian.org') %}
|
{% set apt_mirror = apt_mirror | default('httpredir.debian.org') %}
|
||||||
deb http://{{ apt_mirror }}/debian/ {{ ansible_distribution_release }} main contrib non-free
|
deb http://{{ apt_mirror }}/debian/ {{ ansible_distribution_release }} main contrib non-free
|
||||||
|
Loading…
Reference in New Issue
Block a user