Skip to content

Commit c053850

Browse files
committed
Remove workaround for EL > 8
There were an known issue with EL 9 that has been solved by elastic itself. We dont need it anymore. elastic/elasticsearch#85876
1 parent 56c5751 commit c053850

File tree

5 files changed

+0
-32
lines changed

5 files changed

+0
-32
lines changed

molecule/elasticstack_default/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
tasks:
3131
- name: Enable Elastic installation on RHEL 9
3232
ansible.builtin.set_fact:
33-
elasticstack_rpm_workaround: true
3433
when: ansible_os_family == 'RedHat' and ansible_distribution_major_version >= "9"
3534
- name: Include Redis
3635
ansible.builtin.include_role:

molecule/repos_default/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
collections:
55
- netways.elasticstack
66
vars:
7-
elasticstack_rpm_workaround: true
87
elasticstack_collection_managed: false
98
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
109
elasticstack_no_log: false

molecule/repos_oss/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
- netways.elasticstack
88
vars:
99
elasticstack_variant: oss
10-
elasticstack_rpm_workaround: true
1110
elasticstack_release: 7
1211
elasticstack_no_log: false
1312
tasks:

roles/elasticstack/defaults/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ elasticstack_kibana_port: 5601
2020
elasticstack_override_beats_tls: false
2121
elasticstack_release: 8
2222
elasticstack_repo_key: https://artifacts.elastic.co/GPG-KEY-elasticsearch
23-
elasticstack_rpm_workaround: false
2423
elasticstack_security: true
2524
elasticstack_variant: elastic
2625
elasticstack_force_pip: false

roles/repos/tasks/redhat.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,4 @@
11
---
2-
# See https://github.com/elastic/elasticsearch/issues/85876
3-
# for more information why this is needed
4-
- name: Workaround for EL > 8
5-
when:
6-
- ansible_distribution_major_version >= "9"
7-
block:
8-
9-
- name: Show a warning
10-
ansible.builtin.debug:
11-
msg: "For this workaround to work, please set elasticstack_rpm_workaround to true"
12-
when:
13-
- not elasticstack_rpm_workaround | bool
14-
15-
- name: Enable workaround for rpm keys
16-
when:
17-
- elasticstack_rpm_workaround | bool
18-
block:
19-
20-
- name: Install crypto-policies-scripts
21-
ansible.builtin.package:
22-
name: crypto-policies-scripts
23-
24-
# since we don't expect to have that workaround for long
25-
# we can skip having idempotency checks fixed
26-
- name: Set Crypto policies to legacy
27-
ansible.builtin.command: "update-crypto-policies --set LEGACY"
28-
changed_when: false
29-
302
- name: Ensure Elastic repository key is available (RedHat)
313
ansible.builtin.rpm_key:
324
key: "{{ elasticstack_repo_key }}"

0 commit comments

Comments
 (0)