Skip to content

Commit

Permalink
Fix Ansible warnings
Browse files Browse the repository at this point in the history
And add support for Ubuntu 18.04 and Debian 9
  • Loading branch information
tersmitten committed Nov 26, 2018
1 parent 2239240 commit 968e0a3
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 26 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ python: "2.7"

env:
- ANSIBLE_VERSION=latest
- ANSIBLE_VERSION=2.7.2
- ANSIBLE_VERSION=2.7.1
- ANSIBLE_VERSION=2.7.0
- ANSIBLE_VERSION=2.6.8
- ANSIBLE_VERSION=2.6.7
- ANSIBLE_VERSION=2.6.6
- ANSIBLE_VERSION=2.6.5
Expand Down Expand Up @@ -59,7 +61,7 @@ script:
&& (echo 'Idempotence test: pass' && exit 0)
|| (echo 'Idempotence test: fail' && exit 1)
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml || true; fi
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi

notifications:
email: false
Expand Down
19 changes: 17 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

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


boxes = [
{
:name => "ubuntu-1204",
Expand All @@ -25,17 +26,31 @@ boxes = [
:cpu => "50",
:ram => "256"
},
{
:name => "ubuntu-1804",
:box => "bento/ubuntu-18.04",
:ip => '10.0.0.14',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-7",
:box => "bento/debian-7",
:ip => '10.0.0.14',
:ip => '10.0.0.15',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-8",
:box => "bento/debian-8",
:ip => '10.0.0.15',
:ip => '10.0.0.16',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-9",
:box => "bento/debian-9",
:ip => '10.0.0.17',
:cpu => "50",
:ram => "256"
},
Expand Down
51 changes: 29 additions & 22 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,45 @@
updatedb_prune_bind_mounts: true
updatedb_prunenames: []
updatedb_prunepaths:
- /home/.ecryptfs
- /media
- /tmp
- /var/lib/ceph
- /var/lib/os-prober
- /var/lib/schroot
- /var/spool
- /media
- /home/.ecryptfs
updatedb_prunefs:
- NFS
- nfs
- nfs4
- rpc_pipefs
- afs
- binfmt_misc
- proc
- smbfs
- autofs
- iso9660
- ncpfs
- binfmt_misc
- ceph
- cifs
- coda
- curlftpfs
- devfs
- devpts
- devtmpfs
- ecryptfs
- ftpfs
- devfs
- fuse.ceph
- fuse.glusterfs
- fuse.mfs
- fuse.rozofs
- fuse.sshfs
- fusesmb
- iso9660
- lustre
- lustre_lite
- mfs
- ncpfs
- NFS
- nfs
- nfs4
- proc
- rpc_pipefs
- shfs
- smbfs
- sysfs
- cifs
- lustre
- lustre_lite
- tmpfs
- usbfs
- udf
- fuse.glusterfs
- fuse.sshfs
- curlftpfs
- ecryptfs
- fusesmb
- devtmpfs
- usbfs
3 changes: 3 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# meta file for updatedb
---
galaxy_info:
role_name: updatedb
author: Mischa ter Smitten
company: Oefenweb.nl B.V.
description: Manage updatedb Debian-like systems
Expand All @@ -12,10 +13,12 @@ galaxy_info:
- precise
- trusty
- xenial
- bionic
- name: Debian
versions:
- wheezy
- jessie
- stretch
galaxy_tags:
- system
dependencies: []
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
---
- name: install
apt:
name: mlocate
name: "{{ updatedb_dependencies }}"
state: "{{ apt_install_state | default('latest') }}"
update_cache: true
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
Expand Down
2 changes: 2 additions & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# vars file for updatedb
---
updatedb_dependencies:
- mlocate

0 comments on commit 968e0a3

Please sign in to comment.