Skip to content

chore: replace injected facts 'ansible_' with dictionary 'ansible_facts' #701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolas-boussuge-fintech wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: replace injected facts 'ansible_' with dictionary 'ansible_facts' #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tasks/pkg-debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
dest: "{{ datadog_apt_trusted_d_keyring }}"
mode: "0644"
remote_src: true
when: ((ansible_distribution == 'Debian' and ansible_distribution_major_version|int < 9) or
(ansible_distribution == 'Ubuntu' and ansible_distribution_major_version | int < 16)) and not ansible_check_mode
when: ((ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_major_version']|int < 9) or
(ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_major_version'] | int < 16)) and not ansible_check_mode

- name: Ensure Datadog non-https repositories and repositories not using signed-by option are deprecated
ansible.builtin.apt_repository:
Expand Down
16 changes: 8 additions & 8 deletions tasks/pkg-suse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
) }}

- name: Check and download RPM Key(SLES11) # Work around due to SNI check for SLES11
when: ansible_distribution_version|int == 11
when: ansible_facts['distribution_version']|int == 11
block:
- name: Stat if current RPM key already exists
ansible.builtin.stat:
Expand All @@ -27,7 +27,7 @@
dest: /tmp/DATADOG_RPM_KEY_CURRENT.public
force: true
mode: '600'
when: ansible_distribution_version|int >= 12
when: ansible_facts['distribution_version']|int >= 12

- name: Import current RPM key
ansible.builtin.rpm_key:
Expand All @@ -36,7 +36,7 @@
when: not ansible_check_mode

- name: Check and download E09422B3 key # Work around due to SNI check for SLES11
when: ansible_distribution_version|int == 11
when: ansible_facts['distribution_version']|int == 11
block:
- name: Stat if E09422B3 key (Expires 2022) RPM key already exists
ansible.builtin.stat:
Expand All @@ -55,7 +55,7 @@
dest: /tmp/DATADOG_RPM_KEY_E09422B3.public
checksum: sha256:{{ datadog_zypper_gpgkey_e09422b3_sha256sum }}
mode: '600'
when: ansible_distribution_version|int >= 12 and agent_datadog_minor is defined and agent_datadog_minor | int < 36
when: ansible_facts['distribution_version']|int >= 12 and agent_datadog_minor is defined and agent_datadog_minor | int < 36

- name: Import E09422B3 key (Expires 2022) RPM key
ansible.builtin.rpm_key:
Expand All @@ -64,7 +64,7 @@
when: not ansible_check_mode and agent_datadog_minor is defined and agent_datadog_minor | int < 36

- name: Check and download 20200908 key # Work around due to SNI check for SLES11
when: ansible_distribution_version|int == 11
when: ansible_facts['distribution_version']|int == 11
block:
- name: Stat if 20200908 key (Expires 2024) RPM key already exists
ansible.builtin.stat:
Expand All @@ -83,7 +83,7 @@
dest: /tmp/DATADOG_RPM_KEY_20200908.public
checksum: sha256:{{ datadog_zypper_gpgkey_20200908_sha256sum }}
mode: '600'
when: ansible_distribution_version|int >= 12
when: ansible_facts['distribution_version']|int >= 12

- name: Import 20200908 key (Expires 2024) RPM key
ansible.builtin.rpm_key:
Expand All @@ -92,7 +92,7 @@
when: not ansible_check_mode

- name: Check and download 20280418 key # Work around due to SNI check for SLES11
when: ansible_distribution_version|int == 11
when: ansible_facts['distribution_version']|int == 11
block:
- name: Stat if 20280418 key (Expires 2028) RPM key already exists
ansible.builtin.stat:
Expand All @@ -111,7 +111,7 @@
dest: /tmp/DATADOG_RPM_KEY_20280418.public
checksum: "sha256:{{ datadog_zypper_gpgkey_20280418_sha256sum }}"
mode: '600'
when: ansible_distribution_version|int >= 12
when: ansible_facts['distribution_version']|int >= 12

- name: Import 20280418 key (Expires 2028) RPM key
ansible.builtin.rpm_key:
Expand Down
2 changes: 1 addition & 1 deletion templates/zypper.repo.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type=rpm-md
gpgcheck={{ datadog_zypper_gpgcheck|int }}
repo_gpgcheck={{ agent_do_zypper_repo_gpgcheck|int }}
{# zypper in SUSE < 15 will not parse (SUSE 11) or respect (SUSE 12 - 14) mutliple entries in gpgkey #}
{% if ansible_distribution_version|int < 15 %}
{% if ansible_facts['distribution_version']|int < 15 %}
gpgkey={{ datadog_zypper_gpgkey_current }}
{% else %}
gpgkey={{ datadog_zypper_gpgkey_current }}
Expand Down