Changes required to install Elasticsearch 6 on staging

src/commcare_cloud/ansible/roles/elasticsearch/templates/config/elasticsearch.yml.j2

@@ -26,15 +26,18 @@ http.max_content_length: 200mb
 path.data: {{ elasticsearch_data_dir }}/data
 path.logs: {{ elasticsearch_data_dir }}/logs
 
-{% if elasticsearch_version is version('5.6.16', '<=') %}
+{% if elasticsearch_version is version('7.0.0', '<') %}
 # discovery.zen.minimum_master_nodes is the minimum number of
 # MASTER ELIGIBLE nodes that must be reachable before a master may be elected
 # Best practice is to set it to M/2 + 1 where M is the number of master-eligible nodes,
 # but (todo) we DO NOT follow best practice.
 discovery.zen.minimum_master_nodes: {{ [2, groups.elasticsearch|map('extract', hostvars, 'elasticsearch_master_value')|select()|list | length] | min }}
+
+{% if elasticsearch_version is version('5.6.16', '<') %}
 discovery.zen.fd.ping_timeout: 90s
 discovery.zen.fd.ping_interval: 10s
 discovery.zen.fd.ping_retries: 20
+{% endif %}
 
 {% if elasticsearch_version == '5.6.16' %}
 discovery.zen.ping_timeout: 90s
@@ -87,8 +90,9 @@ cloud:
 {% endif %}
 
 # Only auto create elastic search internal indices
+{% if elasticsearch_version is version('5.6.16', '<=') %}
 action.auto_create_index: .watches,.triggered_watches,.watcher-history-*
-
+{% endif %}
 
 {% if es_local_repo and not backup_es_s3%}
 path.repo: ["{{ elasticsearch_data_dir }}/snapshot"]

src/commcare_cloud/ansible/roles/elasticsearch/templates/systemd/elasticsearch.service.j2

@@ -7,8 +7,10 @@ After=network-online.target
 [Service]
 Type=simple
 Environment=ES_HOME={{ elasticsearch_home }}
-Environment=CONF_DIR={{ elasticsearch_conf_dir}}
 Environment=ES_PATH_CONF={{ elasticsearch_conf_dir}}
+{% if elasticsearch_version <= '5.6.16'%}
+Environment=CONF_DIR={{ elasticsearch_conf_dir}}
+{% endif %}
 {% if elasticsearch_version == '5.6.16'%}
 Environment=ES_JVM_OPTIONS={{ elasticsearch_conf_dir}}/jvm.options
 {% endif %}