diff --git a/defaults/main.yml b/defaults/main.yml index fa181ce..07ecfc8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,7 +12,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('7.0.0', '>=')) else true }}" update_java: false es_restart_on_change: true es_plugins_reinstall: false @@ -41,8 +41,8 @@ es_api_scheme: "http" es_api_host: "localhost" es_api_port: 9200 es_api_uri: "{{ es_api_scheme }}://{{ es_api_host }}:{{ es_api_port }}" -es_security_api: "{{ '_security' if es_version is version_compare('7.0.0', '>=') else '_xpack/security' }}" -es_license_api: "{{ '_license' if es_version is version_compare('7.0.0', '>=') else '_xpack/license' }}" +es_security_api: "{{ '_security' if es_version is version('7.0.0', '>=') else '_xpack/security' }}" +es_license_api: "{{ '_license' if es_version is version('7.0.0', '>=') else '_xpack/license' }}" es_api_sleep: 15 es_debian_startup_timeout: 10 diff --git a/tasks/elasticsearch-parameters.yml b/tasks/elasticsearch-parameters.yml index b25e4f3..c7af751 100644 --- a/tasks/elasticsearch-parameters.yml +++ b/tasks/elasticsearch-parameters.yml @@ -37,5 +37,5 @@ set_fact: m_lock_enabled={{ es_config['bootstrap.memory_lock'] is defined and es_config['bootstrap.memory_lock'] == True }} - name: set fact use_system_d - set_fact: use_system_d={{(ansible_distribution == 'Debian' and ansible_distribution_version is version_compare('8', '>=')) or (ansible_distribution in ['RedHat','CentOS'] and ansible_distribution_version is version_compare('7', '>=')) or (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('15', '>=')) }} + set_fact: use_system_d={{(ansible_distribution == 'Debian' and ansible_distribution_version is version('8', '>=')) or (ansible_distribution in ['RedHat','CentOS'] and ansible_distribution_version is version('7', '>=')) or (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('15', '>=')) }}