Skip to content

Commit

Permalink
unconditionally include linux install tasks
Browse files Browse the repository at this point in the history
These are also responsible for setting up the installer, and doing some
bookkeeping around our GPG keys.
The installation of the agent package itself is already gated behind
agent_datadog_skip_install, so we won't attemp to reinstall the agent if
it's already installed to the latest version.
However we will now correctly probe for the installer ownership.
This should fix #603
  • Loading branch information
chouquette committed Sep 10, 2024
1 parent 3a0c14b commit 65ad0aa
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

- name: Debian Install Tasks
include_tasks: pkg-debian.yml
when: ansible_facts.os_family == "Debian" and not agent_datadog_skip_install
when: ansible_facts.os_family == "Debian"

- name: Include tasks to remove old GPG keys
include_tasks: _remove_rpm_keys.yml
Expand All @@ -50,11 +50,11 @@
# For Rocky it is some 4.X and >= 5.0
- name: RedHat Install Tasks
include_tasks: pkg-redhat.yml
when: ansible_facts.os_family in ["RedHat", "Rocky", "AlmaLinux"] and not agent_datadog_skip_install
when: ansible_facts.os_family in ["RedHat", "Rocky", "AlmaLinux"]

- name: Suse Install Tasks
include_tasks: pkg-suse.yml
when: ansible_facts.os_family == "Suse" and not agent_datadog_skip_install
when: ansible_facts.os_family == "Suse"

# Note we don't check agent_datadog_skip_install variable value for windows here,
# because some tasks in pkg-windows.yml are carried out regardless of its value.
Expand Down

0 comments on commit 65ad0aa

Please sign in to comment.