Add Elasticsearch 6 support
Remove predefined version from formula
Start using states instead of modules in client.sls
Update test repos to mirror.mirantis.com
Update tests to use ES6
Disable all x-pack features
Change-Id: I7f5a65b0777f2ebce9bd3aae79888d2b00d428b6
Prod-Related: PROD-25122
diff --git a/tests/pillar/client.sls b/tests/pillar/client.sls
index 053d17a..216b590 100644
--- a/tests/pillar/client.sls
+++ b/tests/pillar/client.sls
@@ -1,6 +1,7 @@
elasticsearch:
client:
enabled: true
+ version: 5
server:
host: elasticsearch.host
- port: 9200
\ No newline at end of file
+ port: 9200
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index 18a0194..1972b40 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -16,4 +16,4 @@
index:
shards: 5
replicas: 1
- version: 2
\ No newline at end of file
+ version: 5
diff --git a/tests/pillar/curator.sls b/tests/pillar/curator.sls
index 7425a81..09c2be7 100644
--- a/tests/pillar/curator.sls
+++ b/tests/pillar/curator.sls
@@ -4,7 +4,7 @@
bind:
address: 0.0.0.0
port: 9200
- version: 2
+ version: 5
curator:
timeout: 900
logfile: /var/log/elasticsearch/curator.log
@@ -70,4 +70,4 @@
source: creation_date
direction: older
unit: days
- unit_count: 2
\ No newline at end of file
+ unit_count: 2
diff --git a/tests/pillar/repo_elasticsearch.sls b/tests/pillar/repo_elasticsearch.sls
index 06d43aa..6140c95 100644
--- a/tests/pillar/repo_elasticsearch.sls
+++ b/tests/pillar/repo_elasticsearch.sls
@@ -3,10 +3,8 @@
enabled: true
repo:
elasticsearch_repo:
- source: "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main"
- architectures: amd64
+ source: "deb [arch=amd64] http://mirror.mirantis.com/testing/elasticsearch-5.x/{{ grains.get('oscodename') }} stable main"
+ key_url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
+ elasticsearch_curator_repo:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/nightly/elasticsearch-curator-5/{{ grains.get('oscodename') }} stable main"
key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch"
- mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }} mitaka main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }}/archive-mcp1.0.key"
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index eec8541..7fdf667 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -9,4 +9,4 @@
index:
shards: 1
replicas: 0
- version: 2
+ version: 5