From 5730e94d46299d7b8c90088dad5e58a7f2ee950c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 24 Mar 2019 03:43:39 +0000 Subject: [PATCH] refactor(tofs): use `config` rather than `pillar` throughout --- template/libtofs.jinja | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/libtofs.jinja b/template/libtofs.jinja index 134496e9..2ab2f9c1 100644 --- a/template/libtofs.jinja +++ b/template/libtofs.jinja @@ -12,13 +12,13 @@ * source_files: ordered list of files to look for * lookup: key under ':tofs:source_files' to override list of source files - * default_files_switch: if there's no pillar + * default_files_switch: if there's no config (e.g. pillar) ':tofs:files_switch' this is the ordered list of grains to use as selector switch of the directories under "/files" * indent_witdh: indentation of the result value to conform to YAML * v1_path_prefix: (deprecated) only used for injecting a path prefix into - the source, to support older TOFS pillars + the source, to support older TOFS configs Example (based on a `tplroot` of `xxx`): @@ -67,9 +67,9 @@ {%- endif %} {%- for path_prefix_ext in path_prefix_exts %} {%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %} - {#- For older TOFS implementation, use `files_switch` from the pillar #} + {#- For older TOFS implementation, use `files_switch` from the config #} {#- Use the default, new method otherwise #} - {%- set fsl = salt['pillar.get']( + {%- set fsl = salt['config.get']( tplroot ~ path_prefix_ext|replace('/', ':') ~ ':files_switch', files_switch_list ) %}