fixes

playbooks/roles/common_vars/defaults/main.yml

@@ -225,5 +225,3 @@ COMMON_JWT_SECRET_KEY: 'SET-ME-PLEASE'
 CREATE_SERVICE_WORKER_USERS: True
 
 COMMON_ENABLE_AWS_ROLE: true
-
-COMMON_DISABLE_DATADOG: false

playbooks/roles/datadog-uninstall/defaults/main.yml

-common_datadog_agent_version: '1:5.10.1-1'
-common_datadog_apt_key: "0x382E94DE"
+datadog_uninstall_agent_version: '1:5.10.1-1'
+datadog_uninstall_apt_key: "0x382E94DE"
+DATADOG_UNINSTALL_UBUNTU_APT_KEYSERVER: "http://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search="

playbooks/roles/datadog-uninstall/meta/main.yml

----
-dependencies:
-  - common

playbooks/roles/datadog-uninstall/tasks/main.yml

@@ -2,21 +2,16 @@
 - name: Remove apt key for datadog
   apt_key:
     id: "382E94DE"
-    url: "{{ COMMON_UBUNTU_APT_KEYSERVER }}{{ common_datadog_apt_key }}"
+    url: "{{ DATADOG_UNINSTALL_UBUNTU_APT_KEYSERVER }}{{ common_datadog_apt_key }}"
     state: absent
-  tags:
-    - COMMON_DISABLE_DATADOG
 
 - name: Uninstall apt repository for datadog
   apt_repository:
     repo: 'deb http://apt.datadoghq.com/ stable main'
     state: absent
-  tags:
-    - COMMON_DISABLE_DATADOG
+
 
 - name: Uninstall datadog agent
   apt:
     name: "datadog-agent={{ common_datadog_agent_version }}"
     state: absent
-  tags:
-    - COMMON_DISABLE_DATADOG