Skip to content
Snippets Groups Projects
Commit c2ca424d authored by Heinz Wiesinger's avatar Heinz Wiesinger
Browse files

Use separate global config section when using a config directory.

parent edb8c82f
No related branches found
No related tags found
No related merge requests found
......@@ -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}) -%}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment