Skip to content

Commit

Permalink
Fix Ansible warnings
Browse files Browse the repository at this point in the history
Add support for Ubuntu 18.04 and make go 1.11.2 the default
  • Loading branch information
tersmitten committed Nov 30, 2018
1 parent 4911a2d commit 9c51c7f
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 8 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 @@ -56,7 +58,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
12 changes: 10 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-1404",
Expand All @@ -18,17 +19,24 @@ boxes = [
:cpu => "50",
:ram => "256"
},
{
:name => "ubuntu-1804",
:box => "bento/ubuntu-18.04",
:ip => '10.0.0.14',
: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.16',
:ip => '10.0.0.17',
:cpu => "50",
:ram => "256"
},
Expand Down
10 changes: 7 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# defaults file for go
---
go_version: 'go version go1.10.3 linux/amd64'
go_tarball: 'go1.10.3.linux-amd64.tar.gz'
go_tarball_checksum: 'sha256:fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035'
go_version: 'go version go1.11.2 linux/amd64'
go_tarball: 'go1.11.2.linux-amd64.tar.gz'
go_tarball_checksum: 'sha256:1dfe664fa3d8ad714bbd15a36627992effd150ddabd7523931f077b3926d736d'

# go_version: 'go version go1.10.3 linux/amd64'
# go_tarball: 'go1.10.3.linux-amd64.tar.gz'
# go_tarball_checksum: 'sha256:fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035'

# go_version: 'go version go1.9.7 linux/amd64'
# go_tarball: 'go1.9.7.linux-amd64.tar.gz'
Expand Down
2 changes: 2 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# meta file for go
---
galaxy_info:
role_name: go
author: Mischa ter Smitten
company: Oefenweb.nl B.V.
description: Set up (the latest or a specific version of) Go in Debian-like systems
Expand All @@ -11,6 +12,7 @@ galaxy_info:
versions:
- trusty
- xenial
- bionic
- name: Debian
versions:
- jessie
Expand Down
3 changes: 1 addition & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,10 @@

- name: remove distro versions
apt:
name: "{{ item }}"
name: "{{ go_distro_versions }}"
state: absent
purge: true
when: go_remove_distro_version | bool
with_items: "{{ go_distro_versions }}"
tags:
- go-remove
- go-remove-distro
Expand Down
1 change: 1 addition & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ go_distro_versions:
- golang-1.7
- golang-1.8
- golang-1.9
- golang-1.10

go_download_path: /var/lib/ansible/go/downloads
go_download_url: "https://storage.googleapis.com/golang/{{ go_tarball }}"

0 comments on commit 9c51c7f

Please sign in to comment.