Fix package naming (#368)

Fixes:
The package name for the OSS version had a trailing "-" at the end.
The packages were not updated to the latest version when no version was
provided.

---------

Co-authored-by: Saeid Hassan-Abadi <[email protected]>

Author: Saeid-Abadi

roles/beats/tasks/auditbeat.yml

@@ -5,9 +5,9 @@
     beats_auditbeat_package: >
       {{
       'auditbeat' +
-      (elasticstack_versionseparator +
+      ((elasticstack_versionseparator +
       elasticstack_version |
-      string if elasticstack_version is defined else '') |
+      string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) |
       replace(' ', '')
       }}
 

roles/beats/tasks/filebeat.yml

@@ -5,9 +5,9 @@
     beats_filebeat_package: >
       {{
       'filebeat' +
-      (elasticstack_versionseparator +
+      ((elasticstack_versionseparator +
       elasticstack_version |
-      string if elasticstack_version is defined else '') |
+      string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) |
       replace(' ', '') }}
 
 - name: Install Filebeat - rpm - full stack

roles/beats/tasks/metricbeat.yml

@@ -5,9 +5,9 @@
     beats_metricbeat_package: >
       {{
       'metricbeat' +
-      (elasticstack_versionseparator +
+       ((elasticstack_versionseparator +
       elasticstack_version |
-      string if elasticstack_version is defined else '') |
+      string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) |
       replace(' ', '')
       }}
 

roles/elasticsearch/tasks/main.yml

@@ -131,10 +131,9 @@
     elasticsearch_package: >
       {{
       'elasticsearch' +
-      ('-oss' if elasticstack_variant == 'oss' else '') +
-      (elasticstack_versionseparator +
+      ((elasticstack_versionseparator +
       elasticstack_version |
-      string if elasticstack_version is defined else '') |
+      string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) |
       replace(' ', '')
       }}
 

roles/kibana/tasks/main.yml

@@ -45,9 +45,9 @@
       {{
       'kibana' +
       ('-oss' if elasticstack_variant == 'oss' else '') +
-      (elasticstack_versionseparator +
+      ((elasticstack_versionseparator +
       elasticstack_version |
-      string if elasticstack_version is defined else '') |
+      string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) |
       replace(' ', '') }}
 
 - name: Install Kibana - rpm - full stack

roles/logstash/tasks/main.yml

@@ -61,10 +61,9 @@
     logstash_package: >
       {{
       'logstash' +
-      ('-oss' if elasticstack_variant == 'oss' else '') +
-      (elasticstack_versionseparator +
+      ((elasticstack_versionseparator +
       elasticstack_version |
-      string if elasticstack_version is defined else '') |
+      string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) |
       replace(' ', '')
       }}
   when:
@@ -76,11 +75,8 @@
       {{
       'logstash' +
       ('-oss' if elasticstack_variant == 'oss' else '') +
-      (elasticstack_versionseparator +
-      '1:' +
-      elasticstack_version +
-      '-1' |
-      string if elasticstack_version is defined else '') |
+      ((elasticstack_versionseparator + '1:' + elasticstack_version + '-1')
+      if (elasticstack_version is defined and elasticstack_version | length > 0) else '') |
       replace(' ', '')
       }}
   when: