santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up remaining yml test definitions

Browse source
This commit is contained in:
Michael Russell 2018-06-19 21:36:41 +02:00
parent c325ff79fa
commit e1cfb90f5d
No known key found for this signature in database
GPG key ID: A90C1696496085FE
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/integration/multi.yml
View file

@ -29,7 +29,7 @@
post_tasks: post_tasks:
- include: elasticsearch/test/integration/debug.yml - include: elasticsearch/test/integration/debug.yml
roles: roles:
- role: elasticsearch - elasticsearch
vars: vars:
es_enable_xpack: false es_enable_xpack: false
es_scripts: true es_scripts: true

6
test/integration/oss-upgrade.yml
View file

@ -4,8 +4,9 @@
post_tasks: post_tasks:
- include: elasticsearch/test/integration/debug.yml - include: elasticsearch/test/integration/debug.yml
roles: roles:
- { role: elasticsearch, es_instance_name: "node1" } - elasticsearch
vars: vars:
es_instance_name: "node1"
es_version: "{{ '6.2.4' if es_major_version == '6.x' else '5.6.9' }}" # This is set to an older version than the current default to force an upgrade es_version: "{{ '6.2.4' if es_major_version == '6.x' else '5.6.9' }}" # This is set to an older version than the current default to force an upgrade
es_enable_xpack: false es_enable_xpack: false
es_heap_size: "1g" es_heap_size: "1g"
@ -15,7 +16,8 @@
post_tasks: post_tasks:
- include: elasticsearch/test/integration/debug.yml - include: elasticsearch/test/integration/debug.yml
roles: roles:
- { role: elasticsearch, es_instance_name: "node1" } - elasticsearch
vars: vars:
es_instance_name: "node1"
es_enable_xpack: false es_enable_xpack: false
es_heap_size: "1g" es_heap_size: "1g"

4
test/integration/xpack.yml
View file

@ -5,14 +5,14 @@
post_tasks: post_tasks:
- include: elasticsearch/test/integration/debug.yml - include: elasticsearch/test/integration/debug.yml
roles: roles:
- role: elasticsearch - elasticsearch
vars:
es_api_port: 9200 es_api_port: 9200
es_instance_name: "node1" es_instance_name: "node1"
es_config: es_config:
http.port: 9200 http.port: 9200
transport.tcp.port: 9300 transport.tcp.port: 9300
discovery.zen.ping.unicast.hosts: "localhost:9300" discovery.zen.ping.unicast.hosts: "localhost:9300"
vars:
es_xpack_custom_url: "https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-{{ es_version }}.zip" es_xpack_custom_url: "https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-{{ es_version }}.zip"
es_heap_size: 2g es_heap_size: 2g
es_enable_xpack: true es_enable_xpack: true