Initial Shield support + latest gems + single plugin dir + new port/host vars

2016-07-22 23:44:27 +01:00 · 2016-07-22 23:44:27 +01:00 · ab592724d8
commit ab592724d8
parent 6f968bd789
28 changed files with 459 additions and 172 deletions
--- a/tasks/main.yml
+++ b/tasks/main.yml
@ -1,12 +1,14 @@
 ---
- name: check-parameters
-  include: checkParameters.yml
-  tags:
-      - check
 - name: os-specific vars
  include_vars: "{{ansible_os_family}}.yml"
  tags:
      - always
+
+- name: check-set-parameters
+  include: elasticsearch-parameters.yml
+  tags:
+      - always
+
 - include: java.yml
  when: es_java_install
  tags:
@ -25,10 +27,10 @@
  when: es_plugins is defined or es_plugins_reinstall
  tags:
      - plugins
- include: elasticsearch-shield.yml
-  when: es_install_shield
+- include: xpack/elasticsearch-xpack.yml
+  when: es_enable_xpack
  tags:
-      - shield
+      - xpack
 - include: elasticsearch-service.yml
  tags:
      - service