From 275b7748f159fbe9013aef7465e8cf939d7e45db Mon Sep 17 00:00:00 2001 From: Jakob Reiter Date: Tue, 14 Jul 2015 10:53:12 +0200 Subject: [PATCH] Changed behavior of installing with ninor version supplied or not supplied to work with one task instead of two --- tasks/elasticsearch-Debian.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index 4e77ae4..64cb450 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -3,13 +3,8 @@ apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present - name: Debian - add elasticsearch repository apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present -- name: Debian - Ensure elasticsearch is installed with minor version supplied. - apt: name=elasticsearch={{ es_version }} state=present cache_valid_time=86400 - when: es_version != "" - register: elasticsearch_install -- name: Debian - Ensure elasticsearch is installed without minor version supplied. - apt: name=elasticsearch state=present cache_valid_time=86400 - when: es_version == "" +- name: Debian - Ensure elasticsearch is installed. + apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present cache_valid_time=86400 register: elasticsearch_install - name: Debian - configure memory