Skip to content
This repository was archived by the owner on Aug 18, 2023. It is now read-only.

Fix issue templating systemd unit file #41

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tasks/_install_facts.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: 'Set {{ prometheus_software_name_version }} installation core facts'
set_fact:
prometheus_software_command_args: '{{ prometheus_software_opts }} + {{ prometheus_software_extra_opts | default([], true) }}'
prometheus_software_command_args: '{{ prometheus_software_opts + (prometheus_software_extra_opts | default([], true)) }}'
prometheus_software_root_dir:
"{% if prometheus_exporter is defined and not prometheus_exporter %}\
{{ prometheus_root_dir }}/{{ prometheus_software_name }}\
Expand Down
3 changes: 0 additions & 3 deletions tasks/_install_from_binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@

- name: Find {{ prometheus_software_name_version }} archive contents
command: 'tar -tf {{ prometheus_software_archive_file }}'
args:
# Do not warn that we are running the tar command directly
warn: false
register: prometheus_software_archive_contents
changed_when: false
when:
Expand Down
2 changes: 1 addition & 1 deletion tasks/_setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
include_vars: 'os-architecture/{{ ansible_system }}-{{ ansible_architecture }}.yml'

- name: Include role mesaguy.prometheus common task
include: _common.yml
include_tasks: _common.yml

- name: Define setup as complete
set_fact:
Expand Down
2 changes: 1 addition & 1 deletion tasks/rabbitmq_exporter_kbudde.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{{ { "PUBLISH_ADDR": prometheus_software_host, "PUBLISH_PORT": prometheus_software_port } | combine(prometheus_software_env_vars) }}
prometheus_software_url:
"https://github.com/{{ prometheus_software_author }}/{{ prometheus_software_binary_name }}/releases/download/{{ prometheus_software_version }}/\
{{ prometheus_software_binary_name }}-{{ prometheus_software_version | regex_replace('^(v)?') }}.{{ prometheus_software_architecture }}.tar.gz"
{{ prometheus_software_binary_name }}_{{ prometheus_software_version | regex_replace('^(v)?') }}_{{ prometheus_software_architecture | replace('-', '_') }}.tar.gz"

- name: Include task to perform installation of {{ prometheus_software_name_version }}
include_tasks: _install.yml
Expand Down