From 661ec8044710cd828fe95f881b03ddf13358f16b Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Fri, 13 Jan 2017 12:18:33 +0000 Subject: [PATCH] move to 5.1.2 --- README.md | 4 ++-- defaults/main.yml | 4 ++-- test/integration/config-5x/serverspec/default_spec.rb | 2 +- test/integration/multi-5x/serverspec/default_spec.rb | 2 +- test/integration/package-5x/serverspec/default_spec.rb | 2 +- test/integration/standard-5x/serverspec/default_spec.rb | 2 +- test/integration/xpack-5x/serverspec/default_spec.rb | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 709d806..9d85284 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 5.1.1 is installed. +The following illustrates applying configuration parameters to an Elasticsearch instance. By default, Elasticsearch 5.1.2is installed. ``` - name: Elasticsearch with custom configuration @@ -312,7 +312,7 @@ Additional parameters to es_config allow the customization of the Java and Elast Following variables affect the versions installed: * ```es_major_version``` (e.g. "5.1" ). Should be consistent with es_version. For versions >= 5.0 this must be "5.x". -* ```es_version``` (e.g. "5.1.1"). +* ```es_version``` (e.g. "5.1.2"). * ```es_api_host``` The host name used for actions requiring HTTP e.g. installing templates. Defaults to "localhost". * ```es_api_port``` The port used for actions requiring HTTP e.g. installing templates. Defaults to 9200. * ```es_api_basic_auth_username``` The Elasticsearch username for making admin changing actions. Used if Security is enabled. Ensure this user is admin. diff --git a/defaults/main.yml b/defaults/main.yml index be4f132..03cef9f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,11 +1,11 @@ --- es_major_version: "5.x" -es_version: "5.1.1" +es_version: "5.1.2" es_version_lock: false es_use_repository: true es_apt_key: "https://artifacts.elastic.co/GPG-KEY-elasticsearch" es_apt_url: "deb https://artifacts.elastic.co/packages/{{ es_major_version }}/apt stable main" -es_apt_url_old: "deb https://artifacts.elastic.co/packages/{{ es_major_version }}/apt stable main" +es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" es_start_service: true es_java_install: true update_java: false diff --git a/test/integration/config-5x/serverspec/default_spec.rb b/test/integration/config-5x/serverspec/default_spec.rb index 6e9c4af..72b83d9 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 5.x' do - include_examples 'config::init', "5.1.1" + include_examples 'config::init', "5.1.2" end diff --git a/test/integration/multi-5x/serverspec/default_spec.rb b/test/integration/multi-5x/serverspec/default_spec.rb index 4d54c16..d815816 100644 --- a/test/integration/multi-5x/serverspec/default_spec.rb +++ b/test/integration/multi-5x/serverspec/default_spec.rb @@ -2,7 +2,7 @@ require 'multi_spec' describe 'Multi Tests v 5.x' do - include_examples 'multi::init', "5.1.1", ["kopf"] + include_examples 'multi::init', "5.1.2", ["kopf"] end diff --git a/test/integration/package-5x/serverspec/default_spec.rb b/test/integration/package-5x/serverspec/default_spec.rb index 72cbfbc..156dca8 100644 --- a/test/integration/package-5x/serverspec/default_spec.rb +++ b/test/integration/package-5x/serverspec/default_spec.rb @@ -2,5 +2,5 @@ require 'package_spec' describe 'Package Tests v 5.x' do - include_examples 'package::init', "5.1.1", ["kopf"] + include_examples 'package::init', "5.1.2", ["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 db96847..eaf5121 100644 --- a/test/integration/standard-5x/serverspec/default_spec.rb +++ b/test/integration/standard-5x/serverspec/default_spec.rb @@ -2,7 +2,7 @@ require 'standard_spec' describe 'Standard Tests v 5.x' do - include_examples 'standard::init', "5.1.1" + include_examples 'standard::init', "5.1.2" end diff --git a/test/integration/xpack-5x/serverspec/default_spec.rb b/test/integration/xpack-5x/serverspec/default_spec.rb index 3eb0df7..eb9bef2 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 5.x' do - include_examples 'xpack::init', "5.1.1" + include_examples 'xpack::init', "5.1.2" end