saltstack-formulas/template-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/template-formula.git synced 2025-04-17 10:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d2c9228422 into e3d3c121ef

Browse source
This commit is contained in:
Vagif Veliev 2025-04-04 09:47:58 +02:00 • committed by GitHub
commit 9ae7b7aee7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TEMPLATE/_mapdata/init.sls
View file

@ -3,7 +3,7 @@
---
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/map.jinja" import mapdata with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata with context %}
{%- set _mapdata = {
"values": mapdata,

2
TEMPLATE/config/clean.sls
View file

@ -4,7 +4,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_service_clean = tplroot ~ '.service.clean' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
include:
- {{ sls_service_clean }}

4
TEMPLATE/config/file.sls
View file

@ -4,8 +4,8 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_package_install = tplroot ~ '.package.install' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
include:
- {{ sls_package_install }}

2
TEMPLATE/libmapstack.jinja → TEMPLATE/libs/libmapstack.jinja
View file

@ -3,7 +3,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/libmatchers.jinja" import parse_matchers, query_map with context %}
{%- from tplroot ~ "/libs/libmatchers.jinja" import parse_matchers, query_map with context %}
{%- set _default_config_dirs = [
"parameters/",

2
TEMPLATE/libmatchers.jinja → TEMPLATE/libs/libmatchers.jinja
View file

@ -3,7 +3,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/libsaltcli.jinja" import cli with context %}
{%- from tplroot ~ "/libs/libsaltcli.jinja" import cli with context %}
{%- set query_map = {
"C": "config.get",

0
TEMPLATE/libsaltcli.jinja → TEMPLATE/libs/libsaltcli.jinja
View file

0
TEMPLATE/libtofs.jinja → TEMPLATE/libs/libtofs.jinja
View file

4
TEMPLATE/map.jinja → TEMPLATE/libs/map.jinja
View file

@ -3,7 +3,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/libmapstack.jinja" import mapstack with context %}
{%- from tplroot ~ "/libs/libmapstack.jinja" import mapstack with context %}
{#- Where to lookup parameters source files #}
{%- set formula_param_dir = tplroot ~ "/parameters" %}
@ -63,4 +63,4 @@
{#- Per formula post-processing of `mapdata` if it exists #}
{%- do salt["log.debug"]("map.jinja: post-processing of 'mapdata'") %}
{%- include tplroot ~ "/post-map.jinja" ignore missing %}
{%- include formula_param_dir ~ "/post-map.jinja" ignore missing %}

2
TEMPLATE/package/clean.sls
View file

@ -4,7 +4,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_clean = tplroot ~ '.config.clean' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
include:
- {{ sls_config_clean }}

2
TEMPLATE/package/install.sls
View file

@ -3,7 +3,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
TEMPLATE-package-install-pkg-installed:
pkg.installed:

2
TEMPLATE/service/clean.sls
View file

@ -3,7 +3,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
TEMPLATE-service-clean-service-dead:
service.dead:

2
TEMPLATE/service/running.sls
View file

@ -4,7 +4,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_file = tplroot ~ '.config.file' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
include:
- {{ sls_config_file }}

2
TEMPLATE/subcomponent/config/clean.sls
View file

@ -4,7 +4,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_service_clean = tplroot ~ '.service.clean' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
include:
- {{ sls_service_clean }}

4
TEMPLATE/subcomponent/config/file.sls
View file

@ -4,8 +4,8 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_file = tplroot ~ '.config.file' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
include:
- {{ sls_config_file }}

8
docs/map.jinja.rst
View file

@ -293,7 +293,7 @@ The ``map.jinja`` file aggregates configuration values from several sources:
For the values loaded from YAML files, ``map.jinja`` will automatically try to load a Jinja2 template with the same name as the YAML file with the addition of the ``.jinja`` extension, for example ``foo/bar/quux.yaml.jinja``.
After loading values from all sources, it will try to include the ``salt://{{ tplroot }}/post-map.jinja`` Jinja file if it exists which can post-process the ``mapdata`` variable.
After loading values from all sources, it will try to include the ``salt://{{ tplroot }}/parameters/post-map.jinja`` Jinja file if it exists which can post-process the ``mapdata`` variable.
Configuring ``map.jinja`` sources
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -458,7 +458,7 @@ Here is the best way to use it in an ``sls`` file:
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
test-does-nothing-but-display-TEMPLATE-as-json:
test.nop:
@ -480,8 +480,8 @@ Here is an example based on `template-formula/TEMPLATE/config/file.sls`_:
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_package_install = tplroot ~ '.package.install' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
include:
- {{ sls_package_install }}