fix(libtofs): avoid using subpath by default

* Only the `systemd-formula` uses these, so avoid for all other formulas
This commit is contained in:
Imran Iqbal 2019-08-06 09:52:57 +01:00
parent f63e73c4ee
commit c07471da12
No known key found for this signature in database
GPG key ID: 6D8629439D2B7819
3 changed files with 9 additions and 4 deletions

View file

@ -493,7 +493,8 @@ For example, the following ``formula.component.config`` SLS:
- mode: 644
- template: jinja
- source: {{ files_switch(['formula.conf'],
lookup='formula'
lookup='formula',
use_subpath=True
)
}}

View file

@ -2,7 +2,8 @@
lookup=None,
default_files_switch=['id', 'os_family'],
indent_width=6,
v1_path_prefix='') %}
v1_path_prefix='',
use_subpath=False) %}
{#-
Returns a valid value for the "source" parameter of a "file.managed"
state function. This makes easier the usage of the Template Override and
@ -19,6 +20,8 @@
* 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 configs
* use_subpath: defaults to `False` but if set, lookup the source file
recursively from the current state directory up to `tplroot`
Example (based on a `tplroot` of `xxx`):
@ -66,7 +69,7 @@
{%- set path_prefix_exts = [''] %}
{%- if v1_path_prefix != '' %}
{%- do path_prefix_exts.append(v1_path_prefix) %}
{%- elif tplroot != tpldir %}
{%- elif use_subpath and tplroot != tpldir %}
{#- Walk directory tree to find {{ files_dir }} #}
{%- set subpath_parts = tpldir.lstrip(tplroot).lstrip('/').split('/') %}
{%- for path in subpath_parts %}

View file

@ -14,7 +14,8 @@ template-subcomponent-config-file-file-managed:
file.managed:
- name: {{ template.subcomponent.config }}
- source: {{ files_switch(['subcomponent-example.tmpl'],
lookup='template-subcomponent-config-file-file-managed'
lookup='template-subcomponent-config-file-file-managed',
use_subpath=True
)
}}
- mode: 644