Merge branch 'activate-elasticsearch-license' of https://github.com/barryib/ansible-elasticsearch into barryib-activate-elasticsearch-license

2017-01-04 11:00:40 +00:00 · 2017-01-04 11:00:40 +00:00 · 6768a15b89
commit 6768a15b89
parent cc60a4ecbb 5da67786e2
7 changed files with 55 additions and 2 deletions
--- a/test/integration/xpack.yml
+++ b/test/integration/xpack.yml
@ -5,6 +5,7 @@
    - { role: elasticsearch, es_config: { "http.port": 9200, "transport.tcp.port":9300, discovery.zen.ping.unicast.hosts: "localhost:9300",
    "shield.authc.realms.file1.type": "file","shield.authc.realms.file1.order": 0, "shield.authc.realms.native1.type": "native","shield.authc.realms.native1.order": 1 },
    es_instance_name: "shield_node" }
+  include_vars: <%= ENV['ES_XPACK_LICENSE_FILE'] %>
  vars:
    es_templates: true
    es_enable_xpack: true