From dffb17e59a0c87aaa7b927e6d2b298857bd7d3d1 Mon Sep 17 00:00:00 2001
From: Dale McDiarmid <dalem@elastic.co>
Date: Fri, 6 Jan 2017 11:34:19 +0000
Subject: [PATCH] Tests moved to 5.x

---
 README.md                                               | 8 ++++----
 defaults/main.yml                                       | 4 ++--
 test/integration/config-5x/serverspec/default_spec.rb   | 4 ++--
 test/integration/multi-5x/serverspec/default_spec.rb    | 4 ++--
 test/integration/package-5x/serverspec/default_spec.rb  | 4 ++--
 test/integration/standard-5x/serverspec/default_spec.rb | 4 ++--
 test/integration/xpack-5x/serverspec/default_spec.rb    | 4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index bd5b208..3d7831e 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ The use of a map ensures the Ansible playbook does not need to be updated to ref
 
 In addition to the es_config map, several other parameters are supported for additional functions e.g. script installation.  These can be found in the role's defaults/main.yml file.
 
-The following illustrates applying configuration parameters to an Elasticsearch instance.  By default, Elasticsearch 2.4.3 is installed.
+The following illustrates applying configuration parameters to an Elasticsearch instance.  By default, Elasticsearch 5.1.1 is installed.
 
 ```
 - name: Elasticsearch with custom configuration
@@ -211,7 +211,7 @@ ansible-playbook -i hosts ./your-playbook.yml
 
 ### Installing X-Pack Features
 
-X-Pack features, such as Shield, are supported for Elasticsearch 2.4 only. This feature is currently experimental.  To enable X-Pack set the parameter `es_enable_xpack` to true and list the required features in the parameter `es_xpack_features`.  The following additional parameters allow X-Pack to be configured:
+X-Pack features, such as Security, are supported. This feature is currently experimental.  To enable X-Pack set the parameter `es_enable_xpack` to true and list the required features in the parameter `es_xpack_features`.  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_role_mapping``` Role mappings file declared as yml as described [here](https://www.elastic.co/guide/en/shield/current/mapping-roles.html)
@@ -320,7 +320,7 @@ Following variables affect the versions installed:
 ```yml
   es_plugins:
     - plugin: elasticsearch-cloud-aws
-      version: 2.5.0
+      version: 5.0.0
 ```
 * ```es_allow_downgrades``` For development purposes only. (true or false (default) )
 * ```es_java_install``` If set to false, Java will not be installed. (true (default) or false)
@@ -368,7 +368,7 @@ To define proxy only for a particular plugin during its installation:
 ```
   es_plugins:
     - plugin: elasticsearch-cloud-aws
-      version: 2.5.0
+      version: 5.0.0
       proxy_host: proxy.example.com
       proxy_port: 8080
 ```
diff --git a/defaults/main.yml b/defaults/main.yml
index dfa55da..faaffc5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
-es_major_version: "2.x"
-es_version: "2.4.3"
+es_major_version: "5.x"
+es_version: "5.1.1"
 es_version_lock: false
 es_use_repository: true
 es_apt_key: "https://packages.elasticsearch.org/GPG-KEY-elasticsearch"
diff --git a/test/integration/config-5x/serverspec/default_spec.rb b/test/integration/config-5x/serverspec/default_spec.rb
index c7d6685..6e9c4af 100644
--- a/test/integration/config-5x/serverspec/default_spec.rb
+++ b/test/integration/config-5x/serverspec/default_spec.rb
@@ -1,6 +1,6 @@
 require 'config_spec'
 
-describe 'Config Tests v 2.x' do
-  include_examples 'config::init', "2.4.3"
+describe 'Config Tests v 5.x' do
+  include_examples 'config::init', "5.1.1"
 end
 
diff --git a/test/integration/multi-5x/serverspec/default_spec.rb b/test/integration/multi-5x/serverspec/default_spec.rb
index 2772909..4d54c16 100644
--- a/test/integration/multi-5x/serverspec/default_spec.rb
+++ b/test/integration/multi-5x/serverspec/default_spec.rb
@@ -1,8 +1,8 @@
 require 'multi_spec'
 
 
-describe 'Multi Tests v 2.x' do
-  include_examples 'multi::init', "2.4.3", ["kopf"]
+describe 'Multi Tests v 5.x' do
+  include_examples 'multi::init', "5.1.1", ["kopf"]
 end
 
 
diff --git a/test/integration/package-5x/serverspec/default_spec.rb b/test/integration/package-5x/serverspec/default_spec.rb
index b452119..72cbfbc 100644
--- a/test/integration/package-5x/serverspec/default_spec.rb
+++ b/test/integration/package-5x/serverspec/default_spec.rb
@@ -1,6 +1,6 @@
 require 'package_spec'
 
 
-describe 'Package Tests v 2.x' do
-  include_examples 'package::init', "2.4.3", ["kopf"]
+describe 'Package Tests v 5.x' do
+  include_examples 'package::init', "5.1.1", ["kopf"]
 end
\ No newline at end of file
diff --git a/test/integration/standard-5x/serverspec/default_spec.rb b/test/integration/standard-5x/serverspec/default_spec.rb
index 853d28d..db96847 100644
--- a/test/integration/standard-5x/serverspec/default_spec.rb
+++ b/test/integration/standard-5x/serverspec/default_spec.rb
@@ -1,8 +1,8 @@
 require 'standard_spec'
 
 
-describe 'Standard Tests v 2.x' do
-  include_examples 'standard::init', "2.4.3"
+describe 'Standard Tests v 5.x' do
+  include_examples 'standard::init', "5.1.1"
 end
 
 
diff --git a/test/integration/xpack-5x/serverspec/default_spec.rb b/test/integration/xpack-5x/serverspec/default_spec.rb
index e372a45..3eb0df7 100644
--- a/test/integration/xpack-5x/serverspec/default_spec.rb
+++ b/test/integration/xpack-5x/serverspec/default_spec.rb
@@ -1,5 +1,5 @@
 require 'xpack_spec'
 
-describe 'Xpack Tests v 2.x' do
-  include_examples 'xpack::init', "2.4.3"
+describe 'Xpack Tests v 5.x' do
+  include_examples 'xpack::init', "5.1.1"
 end