diff --git a/deepsea/map.jinja b/deepsea/map.jinja index dcf2441..8a97de6 100644 --- a/deepsea/map.jinja +++ b/deepsea/map.jinja @@ -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 #} @@ -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' + ) ) ) ) diff --git a/deepsea/osfingermap.yaml b/deepsea/osfingermap.yaml new file mode 100644 index 0000000..9ff02f9 --- /dev/null +++ b/deepsea/osfingermap.yaml @@ -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 diff --git a/pillar.example b/pillar.example index 44ad7a9..f402bf0 100644 --- a/pillar.example +++ b/pillar.example @@ -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