From f2621c4af9055d5befcc586ef0f8e13c5da29f1e Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Thu, 26 Nov 2015 10:56:35 +0000 Subject: [PATCH] Require ports and unicast to be specified for 2.0 --- tasks/checkParameters.yml | 7 +++---- test/integration/config.yml | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tasks/checkParameters.yml b/tasks/checkParameters.yml index 11fe3d8..8e2cc88 100644 --- a/tasks/checkParameters.yml +++ b/tasks/checkParameters.yml @@ -4,13 +4,12 @@ when: es_instance_name is not defined - fail: msg="Parameter 'http.port' must be defined when multicast is disabled" - when: es_config['discovery.zen.ping.multicast.enabled'] == false and es_config['http.port'] is not defined + when: es_config['discovery.zen.ping.multicast.enabled'] == false or (es_version | version_compare('2.0', '>=') and es_config['discovery.zen.ping.multicast.enabled'] is not defined) and es_config['http.port'] is not defined - fail: msg="Parameter 'transport.tcp.port' must be defined when multicast is disabled" - when: es_config['discovery.zen.ping.multicast.enabled'] == false and es_config['transport.tcp.port'] is not defined + when: es_config['discovery.zen.ping.multicast.enabled'] == false or (es_version | version_compare('2.0', '>=') and es_config['discovery.zen.ping.multicast.enabled'] is not defined) and es_config['transport.tcp.port'] is not defined - fail: msg="Parameter 'discovery.zen.ping.unicast.hosts' must be defined when multicast is disabled" - when: es_config['discovery.zen.ping.multicast.enabled'] == false and es_config['discovery.zen.ping.unicast.hosts'] is not defined - + when: es_config['discovery.zen.ping.multicast.enabled'] == false or (es_version | version_compare('2.0', '>=') and es_config['discovery.zen.ping.multicast.enabled'] is not defined) and es_config['discovery.zen.ping.unicast.hosts'] is not defined # If multicast is false OR if > 2.0 AND not defined as true (or explicitly false) \ No newline at end of file diff --git a/test/integration/config.yml b/test/integration/config.yml index 71b02b5..bcb8925 100644 --- a/test/integration/config.yml +++ b/test/integration/config.yml @@ -8,5 +8,4 @@ vars: es_scripts: false es_templates: false - es_version_lock: false - es_config: { "discovery.zen.ping.multicast.enabled": true } \ No newline at end of file + es_version_lock: false \ No newline at end of file