From a29ead8dc9586869578e68d79fb420fbdb2ce945 Mon Sep 17 00:00:00 2001 From: Jakob Reiter Date: Thu, 16 Jul 2015 16:42:39 +0200 Subject: [PATCH 1/5] Added functionality to install rpm from elastic url instead of the repo. --- tasks/elasticsearch-RedHat.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml index 8869d9c..b4706d0 100644 --- a/tasks/elasticsearch-RedHat.yml +++ b/tasks/elasticsearch-RedHat.yml @@ -2,10 +2,19 @@ - name: Ensure libselinux-python on CentOS 6.x yum: name=libselinux-python state=present update_cache=yes when: ( ansible_distribution == "CentOS" ) and ( ansible_distribution_major_version == "6" ) + - name: RedHat - add Elasticsearch repo template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch-{{ es_major_version }}.repo + when: es_use_repository + - name: RedHat - Install Elasticsearch yum: name=elasticsearch{% if es_version is defined and es_version != "" %}-{{ es_version }}{% endif %} state=present update_cache=yes + when: es_use_repository + register: elasticsearch_install + +- name: RedHat - Install Elasticsearch from url + yum: name={{ __es_package_url.default }}-{{ es_version }}.noarch.rpm state=present + when: not es_use_repository register: elasticsearch_install - name: RedHat - configure memory From 2c720238817621ce96411f0aa4aba22210218e51 Mon Sep 17 00:00:00 2001 From: Jakob Reiter Date: Mon, 27 Jul 2015 21:49:09 +0200 Subject: [PATCH 2/5] Update apt cache before java install. Good idea to do this for first package and especialy needed for AWS/EC2 --- tasks/java-Debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/java-Debian.yml b/tasks/java-Debian.yml index 477690b..199e98f 100644 --- a/tasks/java-Debian.yml +++ b/tasks/java-Debian.yml @@ -1,5 +1,5 @@ --- # Debian specific Java - name: Debian - Ensure Java is installed - apt: name={{ item }} state=present cache_valid_time=86400 + apt: name={{ item }} state=present update_cache=yes with_items: java_packages From 3dc934b7b4d7bce1ddaf86f5f1b0e1ac509bcc52 Mon Sep 17 00:00:00 2001 From: Jakob Reiter Date: Mon, 27 Jul 2015 21:54:25 +0200 Subject: [PATCH 3/5] Changed var name to es_package_url and removed unneeded url's --- vars/main.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index d3cad84..f4531d4 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,6 +1,2 @@ --- -__es_package_url: - default: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch" - url_master: "http://s3-eu-west-1.amazonaws.com/build-eu.elasticsearch.org/origin/master/nightly/JDK7/elasticsearch-latest-" - url_17: "http://s3-eu-west-1.amazonaws.com/build.eu-west-1.elastic.co/origin/1.7/nightly/JDK7/elasticsearch-latest-" - url_16: "http://s3-eu-west-1.amazonaws.com/build.eu-west-1.elastic.co/origin/1.6/nightly/JDK7/elasticsearch-latest-" +es_package_url: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch" From 4ddc73882ca0e9647d135893a076a2f48349c1af Mon Sep 17 00:00:00 2001 From: Jakob Reiter Date: Mon, 27 Jul 2015 21:56:19 +0200 Subject: [PATCH 4/5] Changed package url variable to es_package_url and added functionality to install from custom url via es_custom_package_url --- tasks/elasticsearch-Debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index 66bae4b..ea10dc8 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -13,7 +13,7 @@ register: elasticsearch_install - name: Debian - Download elasticsearch from url - get_url: url={{ __es_package_url.default }}-{{ es_version }}.deb dest=/tmp/elasticsearch-{{ es_version }}.deb validate_certs=no + get_url: url={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.deb{% endif %} dest=/tmp/elasticsearch-{{ es_version }}.deb validate_certs=no when: not es_use_repository - name: Debian - Ensure elasticsearch is installed from downloaded package From d13bb2fe98ad5e74eb4e3304fd3623a62adefd9c Mon Sep 17 00:00:00 2001 From: Jakob Reiter Date: Tue, 28 Jul 2015 11:29:56 +0200 Subject: [PATCH 5/5] Changed variable name to es_pakage_url to reflect changes from 3dc934b --- tasks/elasticsearch-RedHat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml index b4706d0..98f37a9 100644 --- a/tasks/elasticsearch-RedHat.yml +++ b/tasks/elasticsearch-RedHat.yml @@ -13,7 +13,7 @@ register: elasticsearch_install - name: RedHat - Install Elasticsearch from url - yum: name={{ __es_package_url.default }}-{{ es_version }}.noarch.rpm state=present + yum: name={{ es_package_url }}-{{ es_version }}.noarch.rpm state=present when: not es_use_repository register: elasticsearch_install