Merge pull request #593 from jmlrt/bunch-of-small-fixes

Bunch of small fixes

docs/multi-instance.md

@@ -10,11 +10,11 @@ If you have single-instances hosts and want to upgrade from previous versions of
 
 1. Override these variables to match previous values:
 ```yaml
-es_conf_dir: /etc/elasticsearch/{{ instance_name }}
+es_conf_dir: /etc/elasticsearch/{{ es_instance_name }}
 es_data_dirs:
-  - /var/lib/elasticsearch/{{ node_name }}-{{ instance_name }}
+  - /var/lib/elasticsearch/{{ inventory_hostname }}-{{ es_instance_name }}
-es_log_dir: /var/log/elasticsearch/{{ node_name }}-{{ instance_name }}
+es_log_dir: /var/log/elasticsearch/{{ inventory_hostname }}-{{ es_instance_name }}
-es_pid_dir: /var/run/elasticsearch/{{ node_name }}-{{ instance_name }}
+es_pid_dir: /var/run/elasticsearch/{{ inventory_hostname }}-{{ es_instance_name }}
 ```
 
 2. Deploy ansible-role. **Even if these variables are overrided, Elasticsearch config file and default option file will change, which imply an Elasticsearch restart.**

tasks/elasticsearch-parameters.yml

@@ -4,10 +4,6 @@
   fail: msg="es_proxy_port must be specified and cannot be blank when es_proxy_host is defined"
   when: (es_proxy_port is not defined or es_proxy_port == '') and (es_proxy_host is defined and es_proxy_host != '')
 
-- name: debug message
-  debug: msg="WARNING - It is recommended you specify the parameter 'http.port'"
-  when: es_config['http.port'] is not defined
-
 #If the user attempts to lock memory they must specify a heap size
 - name: fail when heap size is not specified when using memory lock
   fail: msg="If locking memory with bootstrap.memory_lock a heap size must be specified"

templates/elasticsearch.yml.j2

@@ -50,8 +50,8 @@ xpack.notification.email:
         auth: {{ es_mail_config['require_auth'] }}
         host: {{ es_mail_config['host'] }}
         port: {{ es_mail_config['port'] }}
-        {% if es_mail_config['require_auth'] == true %}
+        {% if es_mail_config['require_auth'] == true -%}
         user: {{ es_mail_config['user'] }}
         password: {{ es_mail_config['pass'] }}
-        {% endif %}
+        {%- endif %}
 {% endif %}

test/integration/xpack-upgrade.yml

@@ -7,13 +7,11 @@
     - elasticsearch
   vars:
     es_config_6x:
-      http.port: 9200
       xpack.security.authc.realms.file1.order: 0
       xpack.security.authc.realms.file1.type: file
       xpack.security.authc.realms.native1.order: 1
       xpack.security.authc.realms.native1.type: native
     es_config_7x:
-      http.port: 9200
       xpack.security.authc.realms.file.file1.order: 0
       xpack.security.authc.realms.native.native1.order: 1
     es_config: "{{ es_config_7x if es_major_version == '7.x' else es_config_6x }}"
@@ -117,13 +115,11 @@
     - elasticsearch
   vars:
     es_config_6x:
-      http.port: 9200
       xpack.security.authc.realms.file1.order: 0
       xpack.security.authc.realms.file1.type: file
       xpack.security.authc.realms.native1.order: 1
       xpack.security.authc.realms.native1.type: native
     es_config_7x:
-      http.port: 9200
       xpack.security.authc.realms.file.file1.order: 0
       xpack.security.authc.realms.native.native1.order: 1
     es_config: "{{ es_config_7x if es_major_version == '7.x' else es_config_6x }}"

test/integration/xpack.yml

@@ -7,7 +7,5 @@
   roles:
     - elasticsearch
   vars:
-    es_config:
-      http.port: 9200
     es_xpack_custom_url: "https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-{{ es_version }}.zip"
     es_heap_size: 2g