Merge branch 'master' into es_repo_base

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 6.6.0 - 2019/01/29
+
+### Features
+
+* 6.6.0  as default Elasticsearch version
+* [#521](https://github.com/elastic/ansible-elasticsearch/pull/521) - @Crazybus - Allow switching between oss and standard packages
+* [#528](https://github.com/elastic/ansible-elasticsearch/pull/528) - @Fra-nk - Use systemd's RequiresMountsFor
+* [#530](https://github.com/elastic/ansible-elasticsearch/pull/530) - @lde - Use dpkg_selections to lock elasticsearch version
+
+### Fixes
+
+* [#513](https://github.com/elastic/ansible-elasticsearch/pull/513) - @kakoni - Fix typo in elasticsearch-parameters.yml
+* [#522](https://github.com/elastic/ansible-elasticsearch/pull/522) - @SlothOfAnarchy - Fix package download URL
+* [#526](https://github.com/elastic/ansible-elasticsearch/pull/527) - @Fra-nk - Allow not installing Elasticsearch deb repository key
+* [#527](https://github.com/elastic/ansible-elasticsearch/pull/527) - @katsukamaru - Execute java version check in check mode
+
 ## 6.5.1.1 - 2018/11/27
 
 ### Fixes

defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 es_major_version: "6.x"
-es_version: "6.5.1"
+es_version: "6.6.0"
 es_use_snapshot_release: false
 es_enable_xpack: true
 es_package_name: "elasticsearch"

tasks/elasticsearch-Debian-version-lock.yml

@@ -1,6 +1,6 @@
 ---
 - name: Debian - hold elasticsearch version
   become: yes
-  command: "apt-mark hold {{ es_package_name }}"
-  register: hold_elasticsearch_result
-  changed_when: "hold_elasticsearch_result.stdout != '{{ es_package_name }} was already set on hold.'"
+  dpkg_selections:
+    name: "{{ es_package_name }}"
+    selection: "hold"

templates/systemd/elasticsearch.j2

@@ -3,6 +3,8 @@ Description=Elasticsearch-{{es_instance_name}}
 Documentation=http://www.elastic.co
 Wants=network-online.target
 After=network-online.target
+{# Directive 'WorkingDirectory' creates an implicit dependecy for {{es_home}}, so it can be omitted here #}
+RequiresMountsFor={{ data_dirs | array_to_str(separator=' ') }} {{log_dir}} {{pid_dir}} {{conf_dir}}
 
 [Service]
 Environment=ES_HOME={{es_home}}