From 3904913be5f5998d1f10ebd8e20e947977389015 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Thu, 18 Mar 2021 15:22:43 +0100
Subject: [PATCH] Fix deb and rpm url (#788)

*    Fix commit fix the deb package url for Elasticsearch 6.x
*    Fix commit fix the rpm package url for Elasticsearch 6.x and 7.x
*    Download deb package directly using apt module
*    Use new ansible syntax
---
 tasks/elasticsearch-Debian.yml | 12 +++++++-----
 tasks/elasticsearch-RedHat.yml |  8 +++++++-
 vars/RedHat.yml                |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml
index b344b41..f6e4c17 100644
--- a/tasks/elasticsearch-Debian.yml
+++ b/tasks/elasticsearch-Debian.yml
@@ -102,13 +102,15 @@
     selection: "hold"
   when: es_version_lock
 
-- name: Debian - Download elasticsearch from url
-  get_url: url={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}-amd64.deb{% endif %} dest=/tmp/elasticsearch-{{ es_version }}.deb validate_certs=no
-  when: not es_use_repository
+# workaround due to https://github.com/ansible/ansible/issues/66977
+- set_fact:
+    es_deb_url: "{% if es_version is version('7.0.0', '>=') %}{{ es_package_url }}-{{ es_version }}-amd64.deb{% else %}{{ es_package_url }}-{{ es_version }}.deb{% endif %}"
 
-- name: Debian - Ensure elasticsearch is installed from downloaded package
+- name: Debian - Install Elasticsearch from url
   become: yes
-  apt: deb=/tmp/elasticsearch-{{ es_version }}.deb
+  apt:
+    deb: "{% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_deb_url }}{% endif %}"
+    state: present
   when: not es_use_repository
   register: elasticsearch_install_from_package
   notify: restart elasticsearch
diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml
index f3ebc1e..7d53fbf 100644
--- a/tasks/elasticsearch-RedHat.yml
+++ b/tasks/elasticsearch-RedHat.yml
@@ -54,9 +54,15 @@
   environment:
     ES_PATH_CONF: "{{ es_conf_dir }}"
 
+# workaround due to https://github.com/ansible/ansible/issues/66977
+- set_fact:
+    es_rpm_url: "{% if es_version is version('7.0.0', '>=') %}{{ es_package_url }}-{{ es_version }}-x86_64.rpm{% else %}{{ es_package_url }}-{{ es_version }}.rpm{% endif %}"
+
 - name: RedHat - Install Elasticsearch from url
   become: yes
-  yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present
+  yum:
+    name: '{% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_rpm_url }}{% endif %}'
+    state: present
   when: not es_use_repository
   register: elasticsearch_install_from_package
   notify: restart elasticsearch
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index b0aa42b..5887416 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,4 +1,4 @@
 ---
 java: "{{ es_java | default('java-1.8.0-openjdk.x86_64') }}"
 default_file: "/etc/sysconfig/elasticsearch"
-es_home: "/usr/share/elasticsearch"
\ No newline at end of file
+es_home: "/usr/share/elasticsearch"