diff --git a/README.md b/README.md index e9a98fa7..e9a68f63 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Role Variables `datadog_checks` instead) - `datadog_apt_repo` - Override default Datadog `apt` repository - `datadog_apt_key_url` - Override default url to Datadog `apt` key +- `datadog_apt_key_url_new` - Override default url to the new Datadog `apt` key (in the near future the `apt` repo will have to be checked against this new key instead of the current key) Dependencies ------------ diff --git a/tasks/pkg-debian.yml b/tasks/pkg-debian.yml index bbce6402..7760ea7b 100644 --- a/tasks/pkg-debian.yml +++ b/tasks/pkg-debian.yml @@ -1,6 +1,12 @@ --- - apt: name=apt-transport-https state=latest +- apt_key: id=A2923DFF56EDA6E76E55E492D3A80E30382E94DE keyserver=hkp://keyserver.ubuntu.com:80 state=present + when: datadog_apt_key_url_new is not defined + +- apt_key: id=A2923DFF56EDA6E76E55E492D3A80E30382E94DE url={{ datadog_apt_key_url_new }} state=present + when: datadog_apt_key_url_new is defined + - apt_key: id=C7A7DA52 keyserver=hkp://keyserver.ubuntu.com:80 state=present when: datadog_apt_key_url is not defined diff --git a/tasks/pkg-redhat.yml b/tasks/pkg-redhat.yml index 78b0e58f..21f421d2 100644 --- a/tasks/pkg-redhat.yml +++ b/tasks/pkg-redhat.yml @@ -1,4 +1,13 @@ --- +- name: Download new RPM key + get_url: + url: "http://yum.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public" + dest: /tmp/DATADOG_RPM_KEY_E09422B3.public + sha256sum: 694a2ffecff85326cc08e5f1a619937999a5913171e42f166e13ec802c812085 + +- name: Import new RPM key + rpm_key: key=/tmp/DATADOG_RPM_KEY_E09422B3.public state=present + - name: Copy repo file into place template: src=datadog.repo.j2 dest=/etc/yum.repos.d/datadog.repo owner=root group=root mode=0644