From f1195508abd868454ab7b6f76a91a082b1a5dd7f Mon Sep 17 00:00:00 2001
From: Slavek Kabrda <slavek.kabrda@datadoghq.com>
Date: Fri, 1 Apr 2022 13:18:09 +0200
Subject: [PATCH] Fix installation of newer pinned version by DNF

---
 tasks/parse-version.yml             | 19 ++++++++++++-------
 tasks/pkg-redhat/install-pinned.yml |  3 ++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/tasks/parse-version.yml b/tasks/parse-version.yml
index b2b0eddd..2027868e 100644
--- a/tasks/parse-version.yml
+++ b/tasks/parse-version.yml
@@ -35,22 +35,27 @@
   set_fact:
     datadog_agent_major_version: "{{ datadog_major }}"
 
+- name: Set helper variables
+  set_fact:
+    datadog_agent_linux_version: "{{ datadog_epoch }}:{{ datadog_major }}.{{ datadog_minor }}.{{ datadog_bugfix }}{{ datadog_suffix }}-{{ datadog_release }}"
+    datadog_rpm_version_finding_cmd: "rpm -q --qf '%{EPOCH}:%{VERSION}-%{RELEASE}' {{ datadog_agent_flavor }}"
+
 - name: Set OS-specific versions
   # NOTE: if changing these, make sure the format correspond with values in datadog_version_finding_cmds below
   set_fact:
-    datadog_agent_debian_version: "{{ datadog_epoch }}:{{ datadog_major }}.{{ datadog_minor }}.{{ datadog_bugfix }}{{ datadog_suffix }}-{{ datadog_release }}"
-    datadog_agent_redhat_version: "{{ datadog_major }}.{{ datadog_minor }}.{{ datadog_bugfix }}{{ datadog_suffix }}-{{ datadog_release }}"
-    datadog_agent_suse_version: "{{ datadog_epoch }}:{{ datadog_major }}.{{ datadog_minor }}.{{ datadog_bugfix }}{{ datadog_suffix }}-{{ datadog_release }}"
+    datadog_agent_debian_version: "{{ datadog_agent_linux_version }}"
+    datadog_agent_redhat_version: "{{ datadog_agent_linux_version }}"
+    datadog_agent_suse_version: "{{ datadog_agent_linux_version }}"
     datadog_agent_windows_version: "{{ datadog_major }}.{{ datadog_minor }}.{{ datadog_bugfix }}{{ datadog_suffix }}"
 
 - name: Construct commands to find Agent version
   set_fact:
     datadog_version_finding_cmds:
       Debian: "dpkg -s {{ datadog_agent_flavor }} | grep '^Version:' | awk '{print $2}'"
-      RedHat: "rpm -q --qf '%{VERSION}-%{RELEASE}' {{ datadog_agent_flavor }}"
-      Rocky: "rpm -q --qf '%{VERSION}-%{RELEASE}' {{ datadog_agent_flavor }}"
-      AlmaLinux: "rpm -q --qf '%{VERSION}-%{RELEASE}' {{ datadog_agent_flavor }}"
-      Suse: "rpm -q --qf '%{EPOCH}:%{VERSION}-%{RELEASE}' {{ datadog_agent_flavor }}"
+      RedHat: "{{ datadog_rpm_version_finding_cmd }}"
+      Rocky: "{{ datadog_rpm_version_finding_cmd }}"
+      AlmaLinux: "{{ datadog_rpm_version_finding_cmd }}"
+      Suse: "{{ datadog_rpm_version_finding_cmd }}"
 
 - name: Create OS-specific version dict
   set_fact:
diff --git a/tasks/pkg-redhat/install-pinned.yml b/tasks/pkg-redhat/install-pinned.yml
index 30eb0d3e..9b9545e0 100644
--- a/tasks/pkg-redhat/install-pinned.yml
+++ b/tasks/pkg-redhat/install-pinned.yml
@@ -11,7 +11,8 @@
 
 - name: Install pinned datadog-agent package (yum)
   yum:
-    name: "{{ datadog_agent_flavor }}-{{ datadog_agent_redhat_version }}"
+    # We have to add architecture, because yum only understands epoch when architecture is also specified
+    name: "{{ datadog_agent_flavor }}-{{ datadog_agent_redhat_version }}.{{ ansible_facts.architecture }}"
     update_cache: yes
     state: present
     allow_downgrade: "{{ datadog_agent_allow_downgrade }}"