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

Use version_compare to test for Ubuntu 18.04 "bionic"

Browse Source 
It just feels more correct, plus I usually forget the release code
name from time to time.
This commit is contained in:
Alan Orth 2018-03-21 20:31:55 +02:00
parent ed607aab68
commit d1ba60e15d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/common/templates/tarsnap_sources.list.j2
View File

@ -1,4 +1,4 @@
{% if ansible_distribution_release == 'bionic' %} {% if ansible_distribution_version | version_compare('18.04', '==') %}
# 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful"
deb https://pkg.tarsnap.com/deb/artful ./ deb https://pkg.tarsnap.com/deb/artful ./
{% else %} {% else %}

2
roles/mariadb/templates/mariadb.list.j2
View File

@ -1,7 +1,7 @@
# {{ ansible_managed }} # {{ ansible_managed }}
{% if ansible_distribution == 'Ubuntu' %} {% if ansible_distribution == 'Ubuntu' %}
{% if ansible_distribution_release == 'bionic' %} {% if ansible_distribution_version | version_compare('18.04', '==') %}
# 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful"
deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.2/ubuntu artful main deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.2/ubuntu artful main
{% else %} {% else %}

4
roles/nginx/templates/nginx_org_sources.list.j2
View File

@ -2,14 +2,14 @@
{% if ansible_distribution == 'Ubuntu' %} {% if ansible_distribution == 'Ubuntu' %}
{% if nginx_version == "stable" %} {% if nginx_version == "stable" %}
{% if ansible_distribution_release == 'bionic' %} {% if ansible_distribution_version | version_compare('18.04', '==') %}
# 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful"
deb https://nginx.org/packages/ubuntu/ artful nginx deb https://nginx.org/packages/ubuntu/ artful nginx
{% else %} {% else %}
deb https://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx deb https://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx
{% endif %} {% endif %}
{% elif nginx_version == "mainline" %} {% elif nginx_version == "mainline" %}
{% if ansible_distribution_release == 'bionic' %} {% if ansible_distribution_version | version_compare('18.04', '==') %}
# 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful"
deb https://nginx.org/packages/mainline/ubuntu/ artful nginx deb https://nginx.org/packages/mainline/ubuntu/ artful nginx
{% else %} {% else %}