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 8f182ff510.

roles/apache/defaults/main.yml

@@ -1,2 +0,0 @@
----
-collectd_apache: true

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.