Skip to content

Commit addd66c

Browse files
Merge pull request #4 from punktDe/v8-update
Start work on v8 compatibility, add meta file
2 parents 456fe17 + 99ff5ea commit addd66c

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

defaults/main.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
elasticsearch:
3+
version: 7
34
prefix:
45
config: >-
56
{%- if ansible_system == 'Linux' -%}
@@ -61,6 +62,6 @@ elasticsearch:
6162
repository:
6263
apt:
6364
key_url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
64-
repository: deb https://artifacts.elastic.co/packages/7.x/apt stable main
65+
repository: deb https://artifacts.elastic.co/packages/{{ vars.elasticsearch.version }}.x/apt stable main
6566
plugins: {}
6667
http_proxy:

meta/main.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
dependencies: []
3+
4+
galaxy_info:
5+
author: "Punkt.de"
6+
license: "MIT"
7+
description: "Elasticsearch role for Proserver"
8+
role_name: "proserver_elasticsearch"
9+
namespace: "punktde"
10+
min_ansible_version: "2.15"
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
{{ elasticsearch['elasticsearch.yml']|to_nice_yaml(indent=2) }}
1+
{% if elasticsearch.version is not defined or elasticsearch.version is version('8', '<') %}
2+
{{ elasticsearch['elasticsearch.yml'] | to_nice_yaml(indent=2) }}
3+
{% else %}
4+
{{ elasticsearch['elasticsearch.yml'] | ansible.utils.remove_keys(target=['system_call_filter', 'bootstrap']) | to_nice_yaml(indent=2) }}
5+
{% endif %}

0 commit comments

Comments
 (0)