From 480b3fe831b171f3752d52253e40f08e66aec06e Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 25 Sep 2018 22:56:00 -0500 Subject: [PATCH] Fix failing Debian tests. --- .travis.yml | 1 + defaults/main.yml | 2 ++ tasks/setup-Debian.yml | 8 +++++++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 defaults/main.yml diff --git a/.travis.yml b/.travis.yml index aeeea5e..3ca2a9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - MOLECULE_DISTRO: fedora27 - MOLECULE_DISTRO: ubuntu1804 - MOLECULE_DISTRO: debian9 + - MOLECULE_DISTRO: debian8 install: # Install test dependencies. diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..8004cc2 --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,2 @@ +--- +ansible_default_release: "" diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 7688a1f..6e50fb6 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -6,12 +6,18 @@ {{ ansible_distribution_release }}-backports main' state: present filename: "{{ ansible_distribution_release }}_backports" + when: ansible_distribution_version < 9 - name: Update apt cache. apt: update_cache=yes cache_valid_time=86400 +- name: Set the default_release option for older Debian versions. + set_fact: + ansible_default_release: "{{ ansible_distribution_release }}-backports" + when: ansible_distribution_version < 9 + - name: Install Ansible. apt: name: ansible state: present - default_release: "{{ ansible_distribution_release }}-backports" + default_release: "{{ ansible_default_release }}"