Skip to content
This repository has been archived by the owner on Mar 6, 2023. It is now read-only.

Commit

Permalink
Merge pull request #88 from cloudalchemy/deprecation_warnings
Browse files Browse the repository at this point in the history
use new filter schema
  • Loading branch information
paulfantom authored Apr 10, 2018
2 parents b481f15 + e5c4c39 commit 3ece416
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
remote_src: yes
creates: "/tmp/prometheus-{{ prometheus_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}/prometheus"
register: _download_binary
until: _download_binary | success
until: _download_binary is succeeded
retries: 5
delay: 2
# run_once: true
Expand Down Expand Up @@ -90,7 +90,7 @@
- libselinux-python
- policycoreutils-python
register: _download_packages
until: _download_packages | success
until: _download_packages is succeeded
retries: 5
delay: 2
when:
Expand Down
6 changes: 3 additions & 3 deletions tasks/preflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
set_fact:
prometheus_config_validator: "/usr/local/bin/promtool check config %s"
prometheus_rules_validator: "/usr/local/bin/promtool check rules %s"
when: prometheus_version | version_compare('2.0.0', '>=')
when: prometheus_version is version_compare('2.0.0', '>=')

- name: Set validator commands for prometheus 1.x
set_fact:
prometheus_config_validator: "/usr/local/bin/promtool check-config %s"
prometheus_rules_validator: "/usr/local/bin/promtool check-rules %s"
when: prometheus_version | version_compare('2.0.0', '<')
when: prometheus_version is version_compare('2.0.0', '<')

- name: Check if extra config flags are duplicating ansible variables
fail:
Expand All @@ -32,7 +32,7 @@
- name: Set storage retention setting
set_fact:
prometheus_storage_retention: "{{ (prometheus_storage_retention | regex_search('\\d+') | int ) * 24 }}h0m0s"
when: prometheus_version | version_compare('2.0.0', '<')
when: prometheus_version is version_compare('2.0.0', '<')

- name: Fail when prometheus_config_flags_extra duplicates parameters set by other variables
fail:
Expand Down

0 comments on commit 3ece416

Please sign in to comment.