From 3e14b73e11dd762326902a414b91eaee7afde1ba Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Mon, 25 May 2015 04:32:03 +0000 Subject: [PATCH] Revert "Test defining collectd_apache in the apache role. Temporarily limit the effect of this variable to stg to avoid needing a freeze break until I test it." This reverts commit 8f182ff510fef867fb1febd7afb51e263251760b. --- roles/apache/defaults/main.yml | 2 -- roles/collectd/base/tasks/main.yml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 roles/apache/defaults/main.yml diff --git a/roles/apache/defaults/main.yml b/roles/apache/defaults/main.yml deleted file mode 100644 index 372da7ba0c..0000000000 --- a/roles/apache/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -collectd_apache: true diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml index 4e6d718d04..210e7d9c99 100644 --- a/roles/collectd/base/tasks/main.yml +++ b/roles/collectd/base/tasks/main.yml @@ -46,7 +46,7 @@ - collectd notify: - restart collectd - when: collectd_apache is defined && env == 'staging' + when: collectd_apache is defined - name: /etc/collectd/apache.conf copy: src=apache.conf dest=/etc/collectd.d/apache.conf @@ -54,7 +54,7 @@ - collectd notify: - restart collectd - when: collectd_apache is defined && env == 'staging' + when: collectd_apache is defined # Three tasks for handling our (two) custom selinux modules.