mirror of
https://github.com/saltstack-formulas/mysql-formula.git
synced 2025-04-16 17:50:27 +00:00
Use separate global config section when using a config directory.
This commit is contained in:
parent
edb8c82fe0
commit
c2ca424dac
1 changed files with 3 additions and 3 deletions
|
@ -9,10 +9,10 @@
|
|||
{#-
|
||||
===== COMBINE DATA =====
|
||||
-#}
|
||||
{%- if "sections" in mysql.config -%}
|
||||
{%- set goodParamList = mysql.config.sections -%}
|
||||
{%- if "global_config" in mysql and "sections" in mysql.global_config -%}
|
||||
{%- set goodParamList = mysql.global_config.sections -%}
|
||||
{%- for section_name in supported_sections -%}
|
||||
{%- set sectdict = mysql.config.sections[section_name] | default({}) -%}
|
||||
{%- set sectdict = mysql.global_config.sections[section_name] | default({}) -%}
|
||||
{%- for mparam, mvalue in salt['pillar.get']('mysql:global:'+section_name, {}).items() -%}
|
||||
{%- set mparamUnderscore = mparam | replace('-','_') -%}
|
||||
{%- do sectdict.update({mparamUnderscore:mvalue}) -%}
|
||||
|
|
Loading…
Add table
Reference in a new issue