From b40fcaa48c16ce938eea706efc9157d87da1a7a8 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 6 Jul 2017 18:49:31 +0300
Subject: [PATCH] - Cleaner OpenBSD package installation.
---
tasks/main.yml | 3 +--
vars/main.yml | 8 --------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index c99d801..71deeb9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,7 +7,6 @@
- ansible_os_family in collectd_conf
- ansible_os_family in aliases_file
- ansible_os_family in collectd_user
- - ansible_os_family != 'OpenBSD' or ansible_distribution_release in collectd_openbsd_version
- name: APT install
when: ansible_pkg_mgr == 'apt'
@@ -21,7 +20,7 @@
- name: pkg install
when: ansible_pkg_mgr == 'openbsd_pkg'
openbsd_pkg:
- name: '{{ collectd_openbsd_version[ansible_distribution_release] }}'
+ name: collectd%5
state: present
- name: Create configuration directory
diff --git a/vars/main.yml b/vars/main.yml
index dc9d9f6..b79179c 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -5,14 +5,6 @@ collectd_conf:
OpenBSD: /etc/collectd.conf
Debian: /etc/collectd/collectd.conf
-collectd_openbsd_version:
- '5.5': 'collectd-4.10.2p4'
- '5.6': 'collectd-4.10.2p4'
- '5.7': 'collectd-5.4.1p1'
- '5.8': 'collectd-5.5.0p1'
- '5.9': 'collectd-5.5.0p3'
- '6.0': 'collectd-5.5.1'
-
aliases_file:
OpenBSD: /etc/mail/aliases
Debian: /etc/aliases
--
GitLab