From 00faa9115a82aa99b63f5805d0cc3bca8f89472f Mon Sep 17 00:00:00 2001
From: Dale McDiarmid <dalem@elastic.co>
Date: Fri, 18 Aug 2017 20:01:31 +0100
Subject: [PATCH] Added comment in readme for support of es_xpack_custom_url

---
 .kitchen.yml                        | 3 ++-
 README.md                           | 6 +++---
 test/integration/xpack-standard.yml | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index 9d7da71..5870e00 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -109,4 +109,5 @@ suites:
     run_list:
     attributes:
     provisioner:
-      playbook: test/integration/xpack-standard.yml
\ No newline at end of file
+      playbook: test/integration/xpack-standard.yml
+      idempotency_test: true
\ No newline at end of file
diff --git a/README.md b/README.md
index e76877f..ff8233a 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,6 @@ The application of the elasticsearch role results in the installation of a node
 The simplest configuration therefore consists of: 
 
 ```
----
 - name: Simple Example
   hosts: localhost
   roles:
@@ -79,7 +78,7 @@ The following illustrates applying configuration parameters to an Elasticsearch
     es_heap_size: 1g
     es_api_port: 9201
 ```
-`
+
 The role utilises Elasticsearch version defaults.  The following should be set to ensure a successful cluster forms.
 
 * ```es_config['http.port']``` - the http port for the node
@@ -95,7 +94,6 @@ The role makes no attempt to enforce the setting of these are requires users to
 A more complex example:
 
 ```
----
 - name: Elasticsearch with custom configuration
   hosts: localhost
   roles:
@@ -229,8 +227,10 @@ The parameter `es_xpack_features` by default enables all features i.e. it defaul
 The following additional parameters allow X-Pack to be configured:
 
 * ```es_message_auth_file``` System Key field to allow message authentication. This file should be placed in the 'files' directory.
+* ```es_xpack_custom_url``` Url from which X-Pack can be downloaded. This can be used for installations in isolated environments where the elastic.co repo is not accessible. e.g. ```es_xpack_custom_url: "https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-5.5.1.zip"```
 * ```es_role_mapping``` Role mappings file declared as yml as described [here](https://www.elastic.co/guide/en/x-pack/current/mapping-roles.html)
 
+
 ```
 es_role_mapping:
   power_user:
diff --git a/test/integration/xpack-standard.yml b/test/integration/xpack-standard.yml
index 5d7c64b..b9e7fe9 100644
--- a/test/integration/xpack-standard.yml
+++ b/test/integration/xpack-standard.yml
@@ -1,6 +1,6 @@
 #Tests x-pack is idempotent and works when security is not enabled
 ---
-- name: Elasticsearch Xpack tests initial
+- name: Elasticsearch Xpack tests - no security and manual download
   hosts: localhost
   roles:
     - { role: elasticsearch, es_api_port: 9200, es_config: { "http.port": 9200, "transport.tcp.port":9300, discovery.zen.ping.unicast.hosts: "localhost:9300" }, es_instance_name: "security_node" }
@@ -8,6 +8,7 @@
     es_version: "5.5.1"
     es_heap_size: 2g
     es_enable_xpack: true
+    es_xpack_custom_url: "https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-5.5.1.zip"
     es_xpack_features:
       - monitoring
       - graph