From 7f5377d2b7fc880ac5fd0db97afff8f729c2a43d Mon Sep 17 00:00:00 2001 From: Adrien Waksberg Date: Sat, 22 Jun 2019 15:49:13 +0200 Subject: [PATCH] feat: add support for ansible 2.8 --- .kitchen.yml | 2 +- .travis.yml | 1 + CHANGELOG.md | 1 + Gemfile.lock | 78 +++++++++++++++++++++++++++++++++++++------------- tasks/main.yml | 4 +-- 5 files changed, 63 insertions(+), 23 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 4ff8231..8021aa8 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -1,6 +1,6 @@ --- # <% os = ENV['OS'] || 'debian9' %> -# <% ansible = ENV['ANSIBLE_VERSION'] || '2.7' %> +# <% ansible = ENV['ANSIBLE_VERSION'] || '2.8' %> # <% command = os == 'centos7' ? '/usr/sbin/init' : '/bin/systemd' %> driver: diff --git a/.travis.yml b/.travis.yml index 8a31b7f..65f9487 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ env: - OS=debian9 ANSIBLE_VERSION=2.5 - OS=debian9 ANSIBLE_VERSION=2.6 - OS=debian9 ANSIBLE_VERSION=2.7 + - OS=debian9 ANSIBLE_VERSION=2.8 - OS=ubuntu18.04 ANSIBLE_VERSION=2.7 - OS=ubuntu16.04 ANSIBLE_VERSION=2.7 - OS=centos7 ANSIBLE_VERSION=2.7 diff --git a/CHANGELOG.md b/CHANGELOG.md index fc4e1b8..615baab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) ## [Unreleased] +- feat: add support for ansible 2.8 - feat: add labels in checks - feat: add a debug mode with sensu_no_log variable - feat: add mutators diff --git a/Gemfile.lock b/Gemfile.lock index 26f2442..b7d2eae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,39 +2,51 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.0) + bcrypt_pbkdf (1.0.1) builder (3.2.3) + ed25519 (1.2.4) + equatable (0.6.0) erubis (2.7.0) - ffi (1.9.25) - gssapi (1.2.0) + ffi (1.11.1) + gssapi (1.3.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) httpclient (2.8.3) - kitchen-ansible (0.49.0) + kitchen-ansible (0.50.0) net-ssh (>= 3) - test-kitchen (~> 1.4) + test-kitchen (>= 1.4) kitchen-docker_cli (0.19.0) test-kitchen (>= 1.3) + license-acceptance (1.0.13) + pastel (~> 0.7) + tomlrb (~> 1.2) + tty-box (~> 0.3) + tty-prompt (~> 0.18) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - mixlib-install (3.11.5) + mixlib-install (3.11.18) mixlib-shellout mixlib-versioning thor mixlib-shellout (2.4.4) mixlib-versioning (1.2.7) multi_json (1.13.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.2.0) - net-ssh-gateway (1.3.0) - net-ssh (>= 2.6.5) + necromancer (0.5.0) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) + net-ssh (5.2.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) nori (2.6.0) - parallel (1.12.1) - parser (2.5.3.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) + pastel (0.7.3) + equatable (~> 0.6) + tty-color (~> 0.5) powerpack (0.1.2) rainbow (2.2.2) rake @@ -46,22 +58,47 @@ GEM rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.10.0) + ruby-progressbar (1.10.1) rubyntlm (0.6.2) - rubyzip (1.2.2) - test-kitchen (1.24.0) + rubyzip (1.2.3) + strings (0.1.5) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.1.0) + test-kitchen (2.2.5) + bcrypt_pbkdf (~> 1.0) + ed25519 (~> 1.2) + license-acceptance (~> 1.0, >= 1.0.11) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) - net-scp (~> 1.1) - net-ssh (>= 2.9, < 5.0) - net-ssh-gateway (~> 1.2) + net-scp (>= 1.1, < 3.0) + net-ssh (>= 2.9, < 6.0) + net-ssh-gateway (>= 1.2, < 3.0) thor (~> 0.19) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) thor (0.20.3) - unicode-display_width (1.4.1) - winrm (2.3.1) + tomlrb (1.2.8) + tty-box (0.4.0) + pastel (~> 0.7.2) + strings (~> 0.1.5) + tty-cursor (~> 0.7) + tty-color (0.5.0) + tty-cursor (0.7.0) + tty-prompt (0.19.0) + necromancer (~> 0.5.0) + pastel (~> 0.7.0) + tty-reader (~> 0.6.0) + tty-reader (0.6.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.7) + wisper (~> 2.0.0) + tty-screen (0.7.0) + unicode-display_width (1.6.0) + unicode_utils (1.4.0) + winrm (2.3.2) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -78,6 +115,7 @@ GEM logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) winrm (~> 2.0) + wisper (2.0.0) PLATFORMS ruby diff --git a/tasks/main.yml b/tasks/main.yml index 965a269..0c25582 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,7 +2,7 @@ - include_tasks: 'repository-{{ ansible_os_family|lower }}.yml' - import_tasks: agent.yml - when: sensu_agent + when: sensu_agent|bool - import_tasks: backend.yml - when: sensu_backend + when: sensu_backend|bool