Merge branch 'master' into filter-deprecation-fix

tasks/compatibility-variables.yml

@@ -14,6 +14,9 @@
     es_xpack_conf_subdir: ""
     es_repo_name: "{{ es_major_version }}"
     es_xpack_users_command: "elasticsearch-users"
+    es_other_package_name: "elasticsearch-oss"
+    es_other_repo_name: "{{ 'oss-' + es_major_version }}"
+    es_other_apt_url: "deb https://artifacts.elastic.co/packages/{{ 'oss-' + es_major_version }}/apt stable main"
 
 - name: Detect if es_version is before X-Pack was open and included
   set_fact:
@@ -32,7 +35,10 @@
 - name: Use the oss repo and package if xpack is not being used
   set_fact:
     es_repo_name: "{{ 'oss-' + es_major_version }}"
+    es_other_repo_name: "{{ es_major_version }}"
+    es_other_apt_url: "deb https://artifacts.elastic.co/packages/{{ es_major_version }}/apt stable main"
     es_package_name: "elasticsearch-oss"
+    es_other_package_name: "elasticsearch"
   when:
     - es_open_xpack
     - not es_enable_xpack

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"

tasks/elasticsearch-Debian.yml

@@ -7,49 +7,53 @@
   set_fact: force_install=yes
   when: es_allow_downgrades
 
-- name: Debian - Install apt-transport-https to support https APT downloads
+- name: Gracefully stop and remove elasticsearch package if switching between OSS and standard
   become: yes
-  apt: name=apt-transport-https state=present
-  when: es_use_repository
-
-- name: Debian - Add Elasticsearch repository key
-  become: yes
-  apt_key: url="{{ es_apt_key }}" state=present
-  when: es_use_repository and es_apt_key
-
-- name: Debian - Add elasticsearch repository
-  become: yes
-  apt_repository: repo={{ item.repo }} state={{ item.state}}
-  with_items:
-    - { repo: "{{ es_apt_url_old }}", state: "absent" }
-    - { repo: "{{ es_apt_url }}", state: "present" }
-  when: es_use_repository
-
-
-- name: Gracefully stop and remove elasticsearch if we are switching to the oss version
-  when:
-    - es_package_name == 'elasticsearch-oss'
   block:
   - name: Check if the elasticsearch package is installed
-    shell: dpkg-query -W -f'${Status}' elasticsearch
+    shell: "dpkg-query -W -f'${Status}' {{ es_other_package_name }}"
     register: elasticsearch_package
     failed_when: False
     changed_when: False
 
   - name: stop elasticsearch
-    become: yes
     service:
       name: '{{ instance_init_script | basename }}'
       state: stopped
     when: elasticsearch_package.stdout == 'install ok installed'
 
-  - name: Debian - Remove elasticsearch package if we are installing the oss package
-    become: yes
+  - name: Debian - Remove elasticsearch package if we are switching to a different package type
     apt:
-      name: 'elasticsearch'
+      name: '{{ es_other_package_name }}'
       state: absent
     when: elasticsearch_package.stdout == 'install ok installed'
 
+
+- name: Install Elasticsearch repository
+  when: es_use_repository
+  become: yes
+  block:
+  - name: Debian - Install apt-transport-https to support https APT downloads
+    apt:
+      name: apt-transport-https
+      state: present
+
+  - name: Debian - Add Elasticsearch repository key
+    apt_key:
+      url: '{{ es_apt_key }}'
+      state: present
+    when: es_apt_key | string
+
+  - name: Debian - Add elasticsearch repository
+    apt_repository:
+      repo: '{{ item.repo }}'
+      state: '{{ item.state }}'
+    with_items:
+      - { repo: "{{ es_apt_url_old }}", state: "absent" }
+      - { repo: "{{ es_apt_url }}", state: "present" }
+      - { repo: "{{ es_other_apt_url }}", state: "absent" }
+
+
 - name: Debian - Ensure elasticsearch is installed
   become: yes
   apt:

tasks/elasticsearch-RedHat.yml

@@ -13,19 +13,27 @@
 
 - name: RedHat - add Elasticsearch repo
   become: yes
-  template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch-{{ es_repo_name }}.repo
+  template:
+    src: 'elasticsearch.repo'
+    dest: '/etc/yum.repos.d/elasticsearch-{{ es_repo_name }}.repo'
+  when: es_use_repository
+
+- name: RedHat - remove unused Elasticsearch repo
+  become: yes
+  file:
+    path: '/etc/yum.repos.d/elasticsearch-{{ es_other_repo_name }}.repo'
+    state: absent
   when: es_use_repository
 
 - name: RedHat - include versionlock
   include: elasticsearch-RedHat-version-lock.yml
   when: es_version_lock
 
-- name: RedHat - Remove non oss package if the old elasticsearch package is installed
+- name: RedHat - Remove the other elasticsearch package if switching between OSS and standard
   become: yes
   yum:
-    name: 'elasticsearch'
+    name: '{{ es_other_package_name }}'
     state: 'absent'
-  when: es_package_name == 'elasticsearch-oss'
 
 - name: RedHat - Install Elasticsearch
   become: yes

tasks/elasticsearch-parameters.yml

@@ -71,5 +71,5 @@
   set_fact: pid_dir={{ es_pid_dir }}/{{instance_suffix}}
 - name: set fact log_dir
   set_fact: log_dir={{ es_log_dir }}/{{instance_suffix}}
-- name: set fact log_dir
+- name: set fact data_dirs
   set_fact: data_dirs={{ es_data_dirs | append_to_list('/'+instance_suffix) }}

tasks/java.yml

@@ -18,6 +18,7 @@
   register: java_full_path
   failed_when: False
   changed_when: False
+  check_mode: no
   when: ansible_os_family == 'RedHat'
 
 - name: correct java version selected