From 7b0f422f32e8aa0f5311d1d754e3e26b3f27952b Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 1 May 2018 21:31:35 -0500 Subject: [PATCH] PR #47 follow-up: Add tests for Ubuntu 18.04 Bionic, Fedora 27, and fix boolean case. --- .travis.yml | 5 +++-- README.md | 1 + defaults/main.yml | 6 +++--- meta/main.yml | 4 ++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25e8152..d371899 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,10 @@ services: docker env: - distro: centos7 + - distro: ubuntu1804 - distro: ubuntu1604 - - distro: ubuntu1404 - - distro: debian8 + - distro: debian9 + - distro: fedora27 script: # Configure test script so we can run extra tests after playbook is run. diff --git a/README.md b/README.md index 65b8a6e..a420e8c 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Docker Compose installation options. docker_apt_release_channel: stable docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" + docker_apt_ignore_key_error: True (Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release. diff --git a/defaults/main.yml b/defaults/main.yml index b6b754a..3448d79 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,9 +13,9 @@ docker_compose_path: /usr/local/bin/docker-compose # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. docker_apt_release_channel: stable docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" -docker_apt_ignore_key_error: true +docker_apt_ignore_key_error: True -# Used only for RedHat/CentOS/Fedora -docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora")|ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo +# Used only for RedHat/CentOS/Fedora. +docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo docker_yum_repo_enable_edge: 0 docker_yum_repo_enable_test: 0 diff --git a/meta/main.yml b/meta/main.yml index 575a466..939d881 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -12,6 +12,9 @@ galaxy_info: versions: - 6 - 7 + - name: Fedora + versions: + - all - name: Debian versions: - jessie @@ -19,6 +22,7 @@ galaxy_info: versions: - trusty - xenial + - bionic galaxy_tags: - web - system