Skip to content

Commit 6721165

Browse files
committed
Fix Ansible warnings
Add support for Ubuntu 18.04 and Debian 9
1 parent 3d6e0c8 commit 6721165

File tree

5 files changed

+24
-5
lines changed

5 files changed

+24
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ script:
6464
&& (echo 'Idempotence test: pass' && exit 0)
6565
|| (echo 'Idempotence test: fail' && exit 1)
6666
67-
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml || true; fi
67+
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi
6868

6969
notifications:
7070
email: false

Vagrantfile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,31 @@ boxes = [
2525
:cpu => "50",
2626
:ram => "256"
2727
},
28+
{
29+
:name => "ubuntu-1804",
30+
:box => "bento/ubuntu-18.04",
31+
:ip => '10.0.0.14',
32+
:cpu => "50",
33+
:ram => "256"
34+
},
2835
{
2936
:name => "debian-7",
3037
:box => "bento/debian-7",
31-
:ip => '10.0.0.14',
38+
:ip => '10.0.0.15',
3239
:cpu => "50",
3340
:ram => "256"
3441
},
3542
{
3643
:name => "debian-8",
3744
:box => "bento/debian-8",
38-
:ip => '10.0.0.15',
45+
:ip => '10.0.0.16',
46+
:cpu => "50",
47+
:ram => "256"
48+
},
49+
{
50+
:name => "debian-9",
51+
:box => "bento/debian-9",
52+
:ip => '10.0.0.17',
3953
:cpu => "50",
4054
:ram => "256"
4155
},

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 rsyslog
22
---
33
galaxy_info:
4+
role_name: rsyslog
45
author: Mischa ter Smitten
56
company: Oefenweb.nl B.V.
67
description: Manage rsyslog and rsyslog.d 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
- monitoring

tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
- name: install
44
apt:
5-
name: rsyslog
5+
name: "{{ rsyslog_dependencies }}"
66
state: "{{ apt_install_state | default('latest') }}"
77
update_cache: true
88
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
@@ -58,7 +58,7 @@
5858
template:
5959
src: etc/rsyslog.conf.j2
6060
dest: /etc/rsyslog.conf
61-
validate: "rsyslogd -N1 -f %s"
61+
validate: 'rsyslogd -N1 -f %s'
6262
owner: root
6363
group: root
6464
mode: 0440

vars/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# vars file for rsyslog
22
---
3+
rsyslog_dependencies:
4+
- rsyslog
35
rsyslog_user: "{{ 'syslog' if ansible_distribution == 'Ubuntu' else 'root' }}"
46
rsyslog_group: adm
57

0 commit comments

Comments
 (0)