From 8f7040c96160520460ecc5705c0ba5bd4024f435 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 29 May 2019 15:05:28 +0200 Subject: [PATCH 1/5] skip java install on 7.x (java embeded in 7.x version) --- README.md | 2 +- defaults/main.yml | 1 - tasks/main.yml | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 239dc9a2..d2a61d35 100644 --- a/README.md +++ b/README.md @@ -399,7 +399,7 @@ In addition to es_config, the following parameters allow the customization of th * ```es_action_auto_create_index ``` Sets the value for auto index creation, use the syntax below for specifying indexes (else true/false): es_action_auto_create_index: '[".watches", ".triggered_watches", ".watcher-history-*"]' * ```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) +* ```es_java_install``` If set to true, Java will be installed. (true (default for 7.x) or false (default for 6.x)) * ```update_java``` Updates Java to the latest version. (true or false (default)) * ```es_max_map_count``` maximum number of VMA (Virtual Memory Areas) a process can own. Defaults to 262144. * ```es_max_open_files``` the maximum file descriptor number that can be opened by this process. Defaults to 65536. diff --git a/defaults/main.yml b/defaults/main.yml index 393acbdf..bbf9afb5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,7 +11,6 @@ es_apt_key: "{{ es_repo_base }}/GPG-KEY-elasticsearch" es_apt_url: "deb {{ es_repo_base }}/packages/{{ es_repo_name }}/apt stable main" es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_repo_name }}/debian stable main" es_start_service: true -es_java_install: true update_java: false es_restart_on_change: true es_plugins_reinstall: false diff --git a/tasks/main.yml b/tasks/main.yml index 6a622bb6..faad382e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,6 +4,20 @@ when: - es_major_version is undefined +- name: set es_java_install fact for 7.x + set_fact: + es_java_install: false + when: + - es_java_install is undefined + - es_major_version == "7.x" + +- name: set es_java_install fact for 6.x + set_fact: + es_java_install: true + when: + - es_java_install is undefined + - es_major_version == "6.x" + - name: os-specific vars include_vars: "{{ansible_os_family}}.yml" tags: From 421e7e507b62d7ed39a4ff73f1dfb68775aa70c4 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 29 May 2019 16:38:36 +0200 Subject: [PATCH 2/5] update after review --- README.md | 2 +- defaults/main.yml | 1 + tasks/main.yml | 11 +---------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index d2a61d35..404f982e 100644 --- a/README.md +++ b/README.md @@ -399,7 +399,7 @@ In addition to es_config, the following parameters allow the customization of th * ```es_action_auto_create_index ``` Sets the value for auto index creation, use the syntax below for specifying indexes (else true/false): es_action_auto_create_index: '[".watches", ".triggered_watches", ".watcher-history-*"]' * ```es_allow_downgrades``` For development purposes only. (true or false (default) ) -* ```es_java_install``` If set to true, Java will be installed. (true (default for 7.x) or false (default for 6.x)) +* ```es_java_install``` If set to true, Java will be installed. (false (default for 7.x) or true (default for 6.x)) * ```update_java``` Updates Java to the latest version. (true or false (default)) * ```es_max_map_count``` maximum number of VMA (Virtual Memory Areas) a process can own. Defaults to 262144. * ```es_max_open_files``` the maximum file descriptor number that can be opened by this process. Defaults to 65536. diff --git a/defaults/main.yml b/defaults/main.yml index bbf9afb5..bf3c1cc6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,6 +11,7 @@ es_apt_key: "{{ es_repo_base }}/GPG-KEY-elasticsearch" es_apt_url: "deb {{ es_repo_base }}/packages/{{ es_repo_name }}/apt stable main" es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_repo_name }}/debian stable main" es_start_service: true +es_java_install: false update_java: false es_restart_on_change: true es_plugins_reinstall: false diff --git a/tasks/main.yml b/tasks/main.yml index faad382e..4dce7aca 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,19 +4,10 @@ when: - es_major_version is undefined -- name: set es_java_install fact for 7.x - set_fact: - es_java_install: false - when: - - es_java_install is undefined - - es_major_version == "7.x" - - name: set es_java_install fact for 6.x set_fact: es_java_install: true - when: - - es_java_install is undefined - - es_major_version == "6.x" + when: es_major_version == "6.x" - name: os-specific vars include_vars: "{{ansible_os_family}}.yml" From e67808c6db7f0140977ac419bf74470a048f9930 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 29 May 2019 16:52:26 +0200 Subject: [PATCH 3/5] new fix after review --- defaults/main.yml | 2 +- tasks/main.yml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index bf3c1cc6..7cd1cc2c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,7 +11,7 @@ es_apt_key: "{{ es_repo_base }}/GPG-KEY-elasticsearch" es_apt_url: "deb {{ es_repo_base }}/packages/{{ es_repo_name }}/apt stable main" es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_repo_name }}/debian stable main" es_start_service: true -es_java_install: false +es_java_install: "{{ false if ( es_version version_compare('7.0.0', '>')) else true }}" update_java: false es_restart_on_change: true es_plugins_reinstall: false diff --git a/tasks/main.yml b/tasks/main.yml index 4dce7aca..6a622bb6 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,11 +4,6 @@ when: - es_major_version is undefined -- name: set es_java_install fact for 6.x - set_fact: - es_java_install: true - when: es_major_version == "6.x" - - name: os-specific vars include_vars: "{{ansible_os_family}}.yml" tags: From 51704a8977ee93e1e41fbcf7dc390e45e2598650 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 29 May 2019 17:29:47 +0200 Subject: [PATCH 4/5] fix version_compare --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7cd1cc2c..2622c59e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,7 +11,7 @@ es_apt_key: "{{ es_repo_base }}/GPG-KEY-elasticsearch" es_apt_url: "deb {{ es_repo_base }}/packages/{{ es_repo_name }}/apt stable main" es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_repo_name }}/debian stable main" es_start_service: true -es_java_install: "{{ false if ( es_version version_compare('7.0.0', '>')) else true }}" +es_java_install: "{{ false if (es_version is version_compare('7.0.0', '>')) else true }}" update_java: false es_restart_on_change: true es_plugins_reinstall: false From ee06f8c0027a13b23c75039d753420f9dc2358fc Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 29 May 2019 17:37:19 +0200 Subject: [PATCH 5/5] new fix for version_compare --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2622c59e..2c5f858f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,7 +11,7 @@ es_apt_key: "{{ es_repo_base }}/GPG-KEY-elasticsearch" es_apt_url: "deb {{ es_repo_base }}/packages/{{ es_repo_name }}/apt stable main" es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_repo_name }}/debian stable main" es_start_service: true -es_java_install: "{{ false if (es_version is version_compare('7.0.0', '>')) else true }}" +es_java_install: "{{ false if (es_version is version_compare('7.0.0', '>=')) else true }}" update_java: false es_restart_on_change: true es_plugins_reinstall: false