Merge pull request #991 from edx/e0d/datadog-refactor

Refactor key handling.

playbooks/roles/datadog/defaults/main.yml

 ---
 
-datadog_api_key: "PUT_YOUR_API_KEY_HERE"
+DATADOG_API_KEY: "PUT_YOUR_API_KEY_HERE"
 
 datadog_apt_key: "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x226AE980C7A7DA52"
 

playbooks/roles/datadog/tasks/main.yml

@@ -45,7 +45,7 @@
   lineinfile: >
     dest="/etc/dd-agent/datadog.conf"
     regexp="^api_key:.*"
-    line="api_key:{{ datadog_api_key }}"
+    line="api_key:{{ DATADOG_API_KEY }}"
   notify:
     - restart the datadog service
   tags:

playbooks/roles/notifier/defaults/main.yml

@@ -89,7 +89,7 @@ notifier_env_vars:
   CS_API_KEY: "{{ NOTIFIER_COMMENT_SERVICE_API_KEY }}"
   US_URL_BASE: "{{ NOTIFIER_USER_SERVICE_BASE }}"
   US_API_KEY: "{{ NOTIFIER_USER_SERVICE_API_KEY }}"
-  DATADOG_API_KEY: "{{ NOTIFIER_DD_API_KEY }}"
+  DATADOG_API_KEY: "{{ DATADOG_API_KEY }}"
   LOG_LEVEL: "{{ NOTIFIER_LOG_LEVEL }}"
   RSYSLOG_ENABLED: "{{ NOTIFIER_RSYSLOG_ENABLED }}"
   BROKER_URL: "{{ NOTIFIER_CELERY_BROKER_URL }}"