Merge pull request #20 from gamernetwork/master

Allow apt repo settings to be user defined

Author: olivielpeau

README.md

@@ -19,6 +19,8 @@ Role Variables
 - `datadog_config` - Settings to place in `/etc/dd-agent/datadog.conf`.
 - `datadog_process_checks` - Array of process checks and options (DEPRECATED: use `process` under
 `datadog_checks` instead)
+- `datadog_apt_repo` - Override default Datadog `apt` repository
+- `datadog_apt_key_url` - Url to Datadog `apt` key
 
 Dependencies
 ------------

defaults/main.yml

@@ -10,3 +10,6 @@ datadog_checks: {}
 # default user/group
 datadog_user: dd-agent
 datadog_group: root
+
+# default apt repo
+datadog_apt_repo: "deb http://apt.datadoghq.com/ stable main"

tasks/pkg-debian.yml

@@ -2,7 +2,11 @@
 - apt: name=apt-transport-https state=latest
 
 - apt_key: id=C7A7DA52 keyserver=hkp://keyserver.ubuntu.com:80 state=present
+  when: datadog_apt_key_url is not defined
 
-- apt_repository: repo='deb http://apt.datadoghq.com/ stable main' state=present update_cache=yes
+- apt_key: id=C7A7DA52 url={{ datadog_apt_key_url }} state=present
+  when: datadog_apt_key_url is defined
+
+- apt_repository: repo='{{ datadog_apt_repo }}' state=present update_cache=yes
 
 - apt: name=datadog-agent state=latest