Skip to content

Commit

Permalink
test(saltcheck): use local map.jinja to workaround missing tpldata
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Oct 15, 2019
1 parent 7911b71 commit 8845b3c
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cron/saltcheck-tests/config.tst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=sls

{%- from "cron/map.jinja" import cron_settings with context %}
{%- from "cron/saltcheck-tests/map.jinja" import cron_settings with context %}

{%- if 'tasks' in cron_settings %}
{%- for task,task_options in cron_settings.tasks.items() %}
Expand Down
2 changes: 1 addition & 1 deletion cron/saltcheck-tests/install.tst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=sls

{%- from "cron/map.jinja" import cron_settings with context %}
{%- from "cron/saltcheck-tests/map.jinja" import cron_settings with context %}

verify_cron.install:
module_and_function: pkg.version
Expand Down
47 changes: 47 additions & 0 deletions cron/saltcheck-tests/map.jinja
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# -*- coding: utf-8 -*-
# vim: ft=jinja

{#- Start imports as #}
{%- import_yaml "cron" ~ "/defaults.yaml" as default_settings %}
{%- import_yaml "cron" ~ "/osarchmap.yaml" as osarchmap %}
{%- import_yaml "cron" ~ "/osfamilymap.yaml" as osfamilymap %}
{%- import_yaml "cron" ~ "/osmap.yaml" as osmap %}
{%- import_yaml "cron" ~ "/osfingermap.yaml" as osfingermap %}

{#- Retrieve the config dict only once #}
{%- set _config = salt['config.get']("cron", default={}) %}

{%- set defaults = salt['grains.filter_by'](
default_settings,
default="cron",
merge=salt['grains.filter_by'](
osarchmap,
grain='osarch',
merge=salt['grains.filter_by'](
osfamilymap,
grain='os_family',
merge=salt['grains.filter_by'](
osmap,
grain='os',
merge=salt['grains.filter_by'](
osfingermap,
grain='osfinger',
merge=salt['grains.filter_by'](
_config,
default='lookup'
)
)
)
)
)
)
%}

{%- set config = salt['grains.filter_by'](
{'defaults': defaults},
default='defaults',
merge=_config
)
%}

{%- set cron = config %}
2 changes: 1 addition & 1 deletion cron/saltcheck-tests/service.tst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=sls

{%- from "cron/map.jinja" import cron_settings with context %}
{%- from "cron/saltcheck-tests/map.jinja" import cron_settings with context %}

cron.service:
{%- if 'enabled' not in cron_settings or ( 'enabled' in cron_settings and cron_settings.enabled ) %}
Expand Down

0 comments on commit 8845b3c

Please sign in to comment.