saltstack-formulas/prometheus-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(pkgrepo): remove gpgkey2 file.replace for idempotency

Browse Source
This commit is contained in:
Michael Schmitt 2022-02-25 22:46:54 -07:00
parent 24c075693c
commit e96c9531f9
No known key found for this signature in database
GPG Key ID: 5145CC5841E00C15
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prometheus/osfamilymap.yaml
View File

@ -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

6
prometheus/package/repo/install.sls
View File

@ -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 %}