fix(pkgrepo): remove gpgkey2 file.replace for idempotency
This commit is contained in:
parent
24c075693c
commit
e96c9531f9
@ -163,7 +163,7 @@ Debian:
|
|||||||
xmpp_alerts:
|
xmpp_alerts:
|
||||||
name: prometheus-xmpp-alerts
|
name: prometheus-xmpp-alerts
|
||||||
args_file: /etc/default/prometheus-xmpp-alerts
|
args_file: /etc/default/prometheus-xmpp-alerts
|
||||||
|
|
||||||
exporters:
|
exporters:
|
||||||
node_exporter:
|
node_exporter:
|
||||||
textfile_collectors_dependencies:
|
textfile_collectors_dependencies:
|
||||||
@ -188,7 +188,7 @@ RedHat:
|
|||||||
environ_file: /etc/default/alertmanager
|
environ_file: /etc/default/alertmanager
|
||||||
environ:
|
environ:
|
||||||
environ_arg_name: ALERTMANAGER_OPTS
|
environ_arg_name: ALERTMANAGER_OPTS
|
||||||
args:
|
args:
|
||||||
config.file: /etc/prometheus/alertmanager.yml
|
config.file: /etc/prometheus/alertmanager.yml
|
||||||
storage.path: /var/lib/prometheus/alertmanager
|
storage.path: /var/lib/prometheus/alertmanager
|
||||||
node_exporter:
|
node_exporter:
|
||||||
@ -211,10 +211,9 @@ RedHat:
|
|||||||
{% else %}
|
{% else %}
|
||||||
{%- set releasever = "$releasever" %}
|
{%- set releasever = "$releasever" %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
# https://akai-tsuki.hatenablog.com/entry/2017/12/03/000000
|
|
||||||
# yamllint disable rule:line-length
|
# yamllint disable rule:line-length
|
||||||
baseurl: "https://packagecloud.io/prometheus-rpm/release/el/{{ releasever }}/$basearch"
|
baseurl: "https://packagecloud.io/prometheus-rpm/release/el/{{ releasever }}/$basearch"
|
||||||
gpgkey: 'https://packagecloud.io/prometheus-rpm/release/gpgkey gpgkey2=https://raw.githubusercontent.com/lest/prometheus-rpm/master/RPM-GPG-KEY-prometheus-rpm'
|
gpgkey: 'https://packagecloud.io/prometheus-rpm/release/gpgkey https://raw.githubusercontent.com/lest/prometheus-rpm/master/RPM-GPG-KEY-prometheus-rpm'
|
||||||
# yamllint enable rule:line-length
|
# yamllint enable rule:line-length
|
||||||
sslverify: 1
|
sslverify: 1
|
||||||
sslcacert: /etc/pki/tls/certs/ca-bundle.crt
|
sslcacert: /etc/pki/tls/certs/ca-bundle.crt
|
||||||
@ -448,4 +447,3 @@ MacOS:
|
|||||||
statsd_exporter:
|
statsd_exporter:
|
||||||
archive:
|
archive:
|
||||||
source_hash: 15132494523c2b6a89e09b2da63452c8fe587fb82fcc3fd21cc75a4aa2766644
|
source_hash: 15132494523c2b6a89e09b2da63452c8fe587fb82fcc3fd21cc75a4aa2766644
|
||||||
|
|
||||||
|
@ -11,12 +11,6 @@
|
|||||||
prometheus-package-repo-install-pkgrepo-managed:
|
prometheus-package-repo-install-pkgrepo-managed:
|
||||||
pkgrepo.managed:
|
pkgrepo.managed:
|
||||||
{{- format_kwargs(p.pkg.repo) }}
|
{{- format_kwargs(p.pkg.repo) }}
|
||||||
file.replace:
|
|
||||||
# redhat workaround for salt issue #51494
|
|
||||||
- name: /etc/yum.repos.d/prometheus.repo
|
|
||||||
- pattern: ' gpgkey2='
|
|
||||||
- repl: '\n '
|
|
||||||
- ignore_if_missing: True
|
|
||||||
|
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- else %}
|
{%- else %}
|
||||||
|
Loading…
Reference in New Issue
Block a user