From fd2ff5fadeebbe38231d1cdf336d6df2ad11b1c7 Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Sun, 9 Aug 2020 23:14:56 +0100 Subject: [PATCH] fix(ubuntu): pkgrepo cannot be used --- prometheus/osfamilymap.yaml | 6 +++--- prometheus/package/repo/install.sls | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/prometheus/osfamilymap.yaml b/prometheus/osfamilymap.yaml index 4d1dc7d..0630d04 100644 --- a/prometheus/osfamilymap.yaml +++ b/prometheus/osfamilymap.yaml @@ -23,11 +23,11 @@ Debian: pkg: deps: - cron - use_upstream_repo: true + use_upstream_repo: false use_upstream_package: false - use_upstream_archive: false + use_upstream_archive: true repo: - humanname: prometheus repository + humanname: 'prometheus repository' key_url: 'https://s3-eu-west-1.amazonaws.com/deb.robustperception.io/41EFC99D.gpg' file: /etc/apt/sources.list.d/prometheus.list component: diff --git a/prometheus/package/repo/install.sls b/prometheus/package/repo/install.sls index 495b5a2..555d489 100644 --- a/prometheus/package/repo/install.sls +++ b/prometheus/package/repo/install.sls @@ -4,12 +4,12 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import prometheus as p with context %} - {%- if p.pkg.use_upstream_repo and 'repo' in p.pkg %} + {%- if p.pkg.use_upstream_repo and 'repo' in p.pkg and p.pkg.repo %} {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %} prometheus-package-repo-install-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