From 5d0d2dd753d9bd16eb4844bdded19c4de7777a2e Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 8 Feb 2016 12:48:17 +0100
Subject: [PATCH] Uninstall v1 of the sd agent only if explicitly requested
---
defaults/main.yml | 2 ++
tasks/main.yml | 8 +-------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 8f63888..08bd2ab 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -19,3 +19,5 @@ sd_groups:
sd_repo_public_key_uri: 'https://archive.serverdensity.com/sd-packaging-public.key'
sd_agent_plugins_dir: '/usr/share/python/sd-agent/checks.d/plugins'
sd_plugins_files_dir: "{{ playbook_dir }}/files/sd-plugins"
+
+sd_uninstallv1: no
diff --git a/tasks/main.yml b/tasks/main.yml
index af3af51..8e96290 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,14 +1,8 @@
---
# file: roles/serverdensity/tasks/main.yml
-- name: "ServerDensity | Check for old version 1"
- shell: ls /etc/sd-agent/conf.d/disk.yaml.default
- register: sd_v2_available
- ignore_errors: yes
- changed_when: False
-
- include: uninstallv1.yml
- when: sd_v2_available.stdout != '/etc/sd-agent/conf.d/disk.yaml.default'
+ when: sd_uninstallv1
- name: "ServerDensity | Init SD plugin"
local_action:
--
GitLab