Skip to content

Commit

Permalink
fix(map): need osfingermap for debian
Browse files Browse the repository at this point in the history
  • Loading branch information
noelmcloughlin committed Jul 1, 2019
1 parent d005fb0 commit c86f76a
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
5 changes: 4 additions & 1 deletion deepsea/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{#- Start imports as #}
{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
{%- import_yaml tplroot ~ "/osfingermap.yaml" as osmfingerap %}
{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}

{#- Retrieve the config dict only once #}
Expand All @@ -16,7 +17,9 @@
default=tplroot,
merge=salt['grains.filter_by']( osfamilymap, grain='os_family',
merge=salt['grains.filter_by']( osmap, grain='os',
merge=salt['grains.filter_by']( _config, default='lookup'
merge=salt['grains.filter_by']( osfingermap, grain='osfinger',
merge=salt['grains.filter_by']( _config, default='lookup'
)
)
)
)
Expand Down
22 changes: 22 additions & 0 deletions deepsea/osfingermap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
#
# Setup variables using grains['osfinger'] based logic.
# You just need to add the key:values for an `osfinger` that differ
# from `defaults.yaml` + `os_family.yaml` + `osmap.yaml`.
# Only add an `osfinger` which is/will be supported by the formula
#
# If you do not need to provide defaults via the `os_finger` grain,
# you will need to provide at least an empty dict in this file, e.g.
# osfingermap: {}
---
# os: Debian
Debian-9:
pkg:
deps:
- python-rados

Debian-8:
pkg:
deps:
- python-rados
2 changes: 1 addition & 1 deletion pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
deepsea:
version: '12.1.5'
pkg:
use_upstream_source: False
use_upstream_source: True
archive:
uri: https://dl.deepsea.com/oss/release

Expand Down

0 comments on commit c86f76a

Please sign in to comment.