Skip to content

Commit 2ddf981

Browse files
author
Mason Morales
authored
Merge pull request #36 from schneewe/variable_fix
Fixed the regex for version parsing of splunk package request url
2 parents b27db3b + cd884c4 commit 2ddf981

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

roles/splunk/vars/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
# Automatically determine desired splunk version string
33
splunk_file: "{{ splunk_package_url | regex_search('(splunk(?:forwarder)?\\-\\d+[^/]*\\.tgz)') }}"
4-
splunk_v: "{{ splunk_package_url | regex_search('(\\d+.\\d+.\\d+(?:.\\d+)?)') }}"
5-
splunk_build: "{{ splunk_package_url | regex_search('\\d+.\\d+.\\d+(?:.\\d+)?\\-([^-]+)','\\1') | first }}"
4+
splunk_v: "{{ splunk_package_url | regex_search('(\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?)') }}"
5+
splunk_build: "{{ splunk_package_url | regex_search('\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?\\-([^-]+)','\\1') | first }}"
66
# Create desired splunk version string (to compare with the output from the splunk version command for upgrades)
77
splunk_version: "{{ splunk_product }} {{ splunk_v }} (build {{ splunk_build }})"
88
splunk_auth: "{{ splunk_admin_username }}:{{ splunk_admin_password }}"

0 commit comments

Comments
 (0)