From 8f182ff510fef867fb1febd7afb51e263251760b Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Mon, 25 May 2015 04:22:52 +0000 Subject: [PATCH] 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. Signed-off-by: Ricky Elrod --- roles/apache/defaults/main.yml | 2 ++ roles/collectd/base/tasks/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 roles/apache/defaults/main.yml diff --git a/roles/apache/defaults/main.yml b/roles/apache/defaults/main.yml new file mode 100644 index 0000000000..372da7ba0c --- /dev/null +++ b/roles/apache/defaults/main.yml @@ -0,0 +1,2 @@ +--- +collectd_apache: true diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml index 210e7d9c99..4e6d718d04 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 + when: collectd_apache is defined && env == 'staging' - 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 + when: collectd_apache is defined && env == 'staging' # Three tasks for handling our (two) custom selinux modules.