From 0cdc83d918de5b2f1f3208d131ea3dd93c8c78dd Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Wed, 20 Jul 2016 14:57:21 +0100 Subject: [PATCH 1/3] Support for package downgrade --- defaults/main.yml | 1 + tasks/elasticsearch-Debian.yml | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index d3c970d..451000f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,4 +21,5 @@ es_log_dir: "/var/log/elasticsearch" es_work_dir: "/tmp/elasticsearch" es_plugin_dir: "/usr/share/elasticsearch/plugins" es_max_open_files: 65536 +es_allow_downgrades: false diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index 4311abb..cc2112c 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -1,4 +1,14 @@ --- + +- set_fact: force_install=no + tags: + - always + +- set_fact: force_install=yes + when: es_allow_downgrades + tags: + - always + - name: Debian - Add Elasticsearch repository key apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present when: es_use_repository @@ -8,7 +18,7 @@ when: es_use_repository - 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 + 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 register: elasticsearch_install_from_repo From d75961c25ff42da372f54cdba42fb0ce28d740c3 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Wed, 20 Jul 2016 14:59:10 +0100 Subject: [PATCH 2/3] Support for package downgrade --- tasks/elasticsearch-Debian.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index cc2112c..dba5fa5 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -1,13 +1,9 @@ --- - set_fact: force_install=no - tags: - - always - set_fact: force_install=yes when: es_allow_downgrades - tags: - - always - name: Debian - Add Elasticsearch repository key apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present From 6f968bd789b28023b244cab194781b774c473af1 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Wed, 20 Jul 2016 15:06:46 +0100 Subject: [PATCH 3/3] New params in docs --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index efef3b5..1fa450d 100644 --- a/README.md +++ b/README.md @@ -217,6 +217,11 @@ Following variables affect the versions installed: * ```es_start_service``` (true (default) or false) * ```es_plugins_reinstall``` (true or false (default) ) * ```es_plugins``` (an array of plugin definitions e.g.: +* ```es_allow_downgrades``` For development purposes only. (true or false (default) ) +* ```es_java_install``` If set to false, Java will not be installed. (true (default) or false) +* ```update_java``` Updates Java to the latest version. (true or false (default)) + + ``` es_plugins: