From bd17d1f704fcb9b6a83e8b7482ed6590a4f0774e Mon Sep 17 00:00:00 2001 From: Jonathan Strootman Date: Wed, 27 Jul 2016 15:27:49 -0700 Subject: [PATCH 1/2] Removed unused version locking file --- tasks/elasticsearch-version-lock.yml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 tasks/elasticsearch-version-lock.yml diff --git a/tasks/elasticsearch-version-lock.yml b/tasks/elasticsearch-version-lock.yml deleted file mode 100644 index 7189203c..00000000 --- a/tasks/elasticsearch-version-lock.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# Trigger Debian section -- name: Include Debian specific Elasticsearch - include: elasticsearch-Debian-version-lock.yml - when: ansible_os_family == 'Debian' - -# Trigger Redhat section -- name: Include RedHat specific Elasticsearch - include: elasticsearch-RedHat-version-lock.yml - when: ansible_os_family == 'RedHat' From f4f242c7f4c53b3cfe866a6506a0461a30cf3611 Mon Sep 17 00:00:00 2001 From: Jonathan Strootman Date: Wed, 27 Jul 2016 15:29:23 -0700 Subject: [PATCH 2/2] Added version locking to Debian install --- tasks/elasticsearch-Debian.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index dba5fa57..d1f59750 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -13,6 +13,10 @@ apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present when: es_use_repository +- name: Debian - include versionlock + include: elasticsearch-Debian-version-lock.yml + when: es_version_lock + - name: Debian - Ensure elasticsearch is installed apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present force={{force_install}} cache_valid_time=86400 when: es_use_repository