Skip to content

Commit 0d99a03

Browse files
widhalmttbauriedel
authored andcommitted
Fix YAML multiline config for package names
* Use '>-' instead of '>' for YAML multline when creating package names. The extra newline at the end of the string can cause JSON parsing errors as reported by @cbeaujoin-stellar . This change will strip the newline character after the name fixes #357
1 parent 51476c7 commit 0d99a03

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

roles/beats/tasks/auditbeat.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- name: Construct exact name of Auditbeat package
44
ansible.builtin.set_fact:
5-
beats_auditbeat_package: >
5+
beats_auditbeat_package: >-
66
{{
77
'auditbeat' +
88
(elasticstack_versionseparator +

roles/beats/tasks/filebeat.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- name: Construct exact name of Filebeat package
44
ansible.builtin.set_fact:
5-
beats_filebeat_package: >
5+
beats_filebeat_package: >-
66
{{
77
'filebeat' +
88
(elasticstack_versionseparator +

roles/beats/tasks/metricbeat.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- name: Construct exact name of Metricbeat package
44
ansible.builtin.set_fact:
5-
beats_metricbeat_package: >
5+
beats_metricbeat_package: >-
66
{{
77
'metricbeat' +
88
(elasticstack_versionseparator +

roles/kibana/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
- name: Construct exact name of Kibana package
4343
ansible.builtin.set_fact:
44-
kibana_package: >
44+
kibana_package: >-
4545
{{
4646
'kibana' +
4747
('-oss' if elasticstack_variant == 'oss' else '') +

roles/logstash/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
- name: Construct exact name of Logstash package
6060
ansible.builtin.set_fact:
61-
logstash_package: >
61+
logstash_package: >-
6262
{{
6363
'logstash' +
6464
('-oss' if elasticstack_variant == 'oss' else '') +
@@ -72,7 +72,7 @@
7272

7373
- name: Construct exact name of Logstash package
7474
ansible.builtin.set_fact:
75-
logstash_package: >
75+
logstash_package: >-
7676
{{
7777
'logstash' +
7878
('-oss' if elasticstack_variant == 'oss' else '') +

0 commit comments

Comments
 (0)