baby-gnu
commented
4 years ago This is a first draft to see if it pass CI and to show to the community that it can be used quite easily.
I'll rebase this PR with properly split commits when everybody will agree.
The map.jinja for mysql-formula has few differences with the one from template-formula:
- the
pythonpkgtrick - the postprocessing
--- template-formula/TEMPLATE/map.jinja 2020-02-15 13:37:13.000000000 +0100
+++ mysql-formula/mysql/map.jinja 2020-02-15 15:33:39.000000000 +0100
@@ -1,6 +1,13 @@
# -*- coding: utf-8 -*-
# vim: ft=jinja
+{# mysql-formula specific initialisation #}
+{%- set py_ver_settings = {
+ 2: {'pythonpkg': 'python-mysqldb'},
+ 3: {'pythonpkg': 'python3-mysqldb'},
+ } %}
+
+
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
@@ -12,6 +19,10 @@
{%- do salt.log.debug('map.jinja: initialise parameters from ' ~ _defaults_filename ) %}
{%- import_yaml _defaults_filename as default_settings %}
+{# Reproduce previous behaviour #}
+{%- set default_settings = salt.slsutil.merge(py_ver_settings[grains.pythonversion[0]],
+ default_settings) %}
+
{# List of sources to lookup for parameters #}
{%- do salt.log.debug('map.jinja: lookup map.jinja configuration sources') %}
{# Fallback to previously used grains #}
@@ -66,12 +77,13 @@
{# Merge the config dict #}
{%- set config = salt.slsutil.merge(config, _config['formula']) %}
-{#- Change **TEMPLATE** to match with your formula's name and then remove this line #}
-{%- do salt.log.debug('map.jinja: save parameters in variable "TEMPLATE"') %}
-{%- set TEMPLATE = config %}
+{%- do salt.log.debug('map.jinja: save parameters in variable "mysql"') %}
+{%- set mysql = config %}
{#- Post-processing for specific non-YAML customisations #}
{%- if grains.os == 'MacOS' %}
-{%- set macos_group = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
-{%- do TEMPLATE.update({'rootgroup': macos_group}) %}
+{%- set macos_user = salt['pillar.get']('mysql:user', salt['cmd.run']("stat -f '%Su' /dev/console")) %}
+{%- set macos_group = salt['pillar.get']('mysql:group', salt['cmd.run']("stat -f '%Sg' /dev/console")) %}
+{%- do mysql.macos.update({'user': macos_user}) %}
+{%- do mysql.macos.update({'group': macos_group}) %}
{%- endif %}Maybe we could have a uniq map.jinja loading an optional per formula custom.jinja?
Regards.
myii
PR progress checklist (to be filled in by reviewers)
What type of PR is this?
Primary type
[build]Changes related to the build system[chore]Changes to the build process or auxiliary tools and libraries such as documentation generation[ci]Changes to the continuous integration configuration[feat]A new feature[fix]A bug fix[perf]A code change that improves performance[refactor]A code change that neither fixes a bug nor adds a feature[revert]A change used to revert a previous commit[style]Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)Secondary type
[docs]Documentation changes[test]Adding missing or correcting existing testsDoes this PR introduce a
BREAKING CHANGE?No.
Related issues and/or pull requests
Describe the changes you're proposing
I propose to modify
map.jinjato load a configurable list of YAML files.The configuration of
map.jinjais lookup in the following order:defaults.yamlfor the maintainer (can be overrode by the user)map.jinja:sourcesto override globally the configuration for all formulasmysql:map.jinja:sourcesto override the configuration only for this formulaI split all the
os*map.yamlunderparameters/<config>/<configvalue>.yaml.osarch,os_family,os,osfinger, … is split in a separate file instead of a single YAML file per configurationDebianos_familywithout the need to maintain the othersos_family(oros, …) by providing a single file in itsfile_rootsmap.jinja:sources(or the formula specificmysql:map.jinja:sources), for example:['osarch', 'os_family', 'os', 'osfinger', 'domain', 'roles', 'id']domain/example.net.yaml,domain/example.org.yaml,roles/web.yaml,roles/ssh.yaml,id/minion1.example.org.yamlgitfsPillar / config required to test the proposed changes
Debug log showing how the proposed changes work
The first
slsusingmapj.jinjaismysql.databases, here is the debug log during the import ofmap.jinjaThe following import of
map.jinjais less verbose, for example, this is themysql.userdebug log comming just after themysql.database:Documentation checklist
README(e.g.Available states).pillar.example.Testing checklist
state_top).Additional context