Skip to content

Commit fe03f72

Browse files
committed
Add support for Debian 9 and Ubuntu 18.04
1 parent ed808c4 commit fe03f72

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ python: "2.7"
77

88
env:
99
- ANSIBLE_VERSION=latest
10+
- ANSIBLE_VERSION=2.7.2
1011
- ANSIBLE_VERSION=2.7.1
1112
- ANSIBLE_VERSION=2.7.0
13+
- ANSIBLE_VERSION=2.6.8
1214
- ANSIBLE_VERSION=2.6.7
1315
- ANSIBLE_VERSION=2.6.6
1416
- ANSIBLE_VERSION=2.6.5
@@ -59,7 +61,7 @@ script:
5961
&& (echo 'Idempotence test: pass' && exit 0)
6062
|| (echo 'Idempotence test: fail' && exit 1)
6163
62-
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml || true; fi
64+
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi
6365

6466
notifications:
6567
email: false

Vagrantfile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
role = File.basename(File.expand_path(File.dirname(__FILE__)))
55

6+
67
boxes = [
78
{
89
:name => "ubuntu-1204",
@@ -25,17 +26,31 @@ boxes = [
2526
:cpu => "50",
2627
:ram => "256"
2728
},
29+
{
30+
:name => "ubuntu-1804",
31+
:box => "bento/ubuntu-18.04",
32+
:ip => '10.0.0.14',
33+
:cpu => "50",
34+
:ram => "256"
35+
},
2836
{
2937
:name => "debian-7",
3038
:box => "bento/debian-7",
31-
:ip => '10.0.0.14',
39+
:ip => '10.0.0.15',
3240
:cpu => "50",
3341
:ram => "256"
3442
},
3543
{
3644
:name => "debian-8",
3745
:box => "bento/debian-8",
38-
:ip => '10.0.0.15',
46+
:ip => '10.0.0.16',
47+
:cpu => "50",
48+
:ram => "256"
49+
},
50+
{
51+
:name => "debian-9",
52+
:box => "bento/debian-9",
53+
:ip => '10.0.0.17',
3954
:cpu => "50",
4055
:ram => "256"
4156
},

meta/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# meta file for apt-file
22
---
33
galaxy_info:
4+
role_name: apt-file
45
author: Mischa ter Smitten
56
company: Oefenweb.nl B.V.
67
description: Set up apt-file in Debian-like systems
@@ -12,10 +13,12 @@ galaxy_info:
1213
- precise
1314
- trusty
1415
- xenial
16+
- bionic
1517
- name: Debian
1618
versions:
1719
- wheezy
1820
- jessie
21+
- stretch
1922
galaxy_tags:
2023
- system
2124
- packaging

tasks/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
---
33
- name: install
44
apt:
5-
name: "{{ item }}"
5+
name: "{{ apt_file_dependencies }}"
66
state: "{{ apt_install_state | default('latest') }}"
77
update_cache: true
88
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
9-
register: result
10-
with_items: "{{ apt_file_dependencies }}"
9+
register: _result
1110
tags:
1211
- configuration
1312
- apt-file
1413
- apt-file-install
1514

1615
- name: run apt-file update (once)
17-
shell: test -x /usr/bin/apt-file && /usr/bin/apt-file update
18-
when: result | changed
16+
shell: >
17+
test -x /usr/bin/apt-file && /usr/bin/apt-file update
18+
when: _result is changed
1919
tags:
2020
- configuration
2121
- apt-file

0 commit comments

Comments
 (0)