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

Merge pull request #11 from noelmcloughlin/archives

Browse Source 
fix(alternatives): fix requisite
This commit is contained in:
N 2019-06-28 10:57:23 +01:00 committed by GitHub
commit 5045a76f82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar.example
View File

@ -155,4 +155,4 @@ prometheus:
linux: linux:
#'Alternatives system' priority: zero disables (default) #'Alternatives system' priority: zero disables (default)
altpriority: 0 altpriority: {{ range(1, 9100000) | random }}

3
prometheus/archive/alternatives/install.sls
View File

@ -33,14 +33,12 @@ prometheus-archive-alternatives-install-{{ name }}-home-alternatives-install:
- order: 10 - order: 10
- watch: - watch:
- archive: prometheus-archive-install-{{ name }}-archive-extracted - archive: prometheus-archive-install-{{ name }}-archive-extracted
- onlyif: {{ grains.os_family not in ('Suse',) }}
prometheus-archive-alternatives-install-{{ name }}-home-alternatives-set: prometheus-archive-alternatives-install-{{ name }}-home-alternatives-set:
alternatives.set: alternatives.set:
- name: prometheus-{{ name }}-home - name: prometheus-{{ name }}-home
- path: {{ p.dir.basedir }}/{{ bundle }} - path: {{ p.dir.basedir }}/{{ bundle }}
- require: - require:
- cmd: prometheus-archive-alternatives-install-{{ name }}-home-cmd-run
- alternatives: prometheus-archive-alternatives-install-{{ name }}-home-alternatives-install - alternatives: prometheus-archive-alternatives-install-{{ name }}-home-alternatives-install
{%- endif %} {%- endif %}
@ -49,7 +47,6 @@ prometheus-archive-alternatives-install-{{ name }}-home-alternatives-set:
prometheus-archive-alternatives-install-{{ name }}-cmd-run-{{ b }}-alternative: prometheus-archive-alternatives-install-{{ name }}-cmd-run-{{ b }}-alternative:
cmd.run: cmd.run:
- onlyif: {{ grains.os_family in ('Suse',) }}
- name: update-alternatives --install /usr/local/bin/{{ b }} prometheus-{{ name }}-{{ b }} {{ p.dir.basedir }}/{{ bundle }}/{{ b }} {{ p.linux.altpriority }} - name: update-alternatives --install /usr/local/bin/{{ b }} prometheus-{{ name }}-{{ b }} {{ p.dir.basedir }}/{{ bundle }}/{{ b }} {{ p.linux.altpriority }}
- require: - require:
- cmd: prometheus-archive-alternatives-install-{{ name }}-home-cmd-run - cmd: prometheus-archive-alternatives-install-{{ name }}-home-cmd-run

2
prometheus/archive/init.sls
View File

@ -9,8 +9,6 @@
include: include:
- .install - .install
{%- if grains.kernel|lower == 'linux' %}
- .alternatives - .alternatives
{%- endif %}
{%- endif %} {%- endif %}