Merge pull request #1229 from edx/feanil/optional_datadog

Feanil/optional datadog

playbooks/edx-east/jenkins_master.yml → playbooks/edx-east/jenkins_testeng_master.yml

-# Configure a Jenkins master instance
+# Configure a Jenkins master instance for testeng
 # This has the Jenkins Java app, but none of the requirements
 # to run the tests.
 
@@ -8,6 +8,9 @@
   gather_facts: True
   vars:
     COMMON_DATA_DIR: "/mnt"
+    COMMON_ENABLE_DATADOG: True
   roles:
     - common
+    - role: datadog
+      when: COMMON_ENABLE_DATADOG
     - jenkins_master

playbooks/roles/jenkins_master/meta/main.yml

 ---
 dependencies:
   - common
-  - role: datadog
-    COMMON_ENABLE_DATADOG: True

playbooks/roles/jenkins_master/tasks/main.yml

@@ -128,3 +128,4 @@
   notify: start nginx
 
 - include: datadog.yml tags=datadog
+  when: COMMON_ENABLE_DATADOG