Explorar el Código

Fix meta/salt.yml to workaround broken formulas

Change-Id: I6b6fbaaebd3e349bf76aa05cb9eb2004a842d9c5
pull/132/head
Filip Pytloun hace 7 años
padre
commit
36200a423f
Se han modificado 1 ficheros con 6 adiciones y 3 borrados
  1. +6
    -3
      linux/meta/salt.yml

+ 6
- 3
linux/meta/salt.yml Ver fichero

@@ -12,9 +12,12 @@ grain:
{%- for service_name, service in pillar.items() %}
{%- if service.get('_support', {}).get('sphinx', {}).get('enabled', False) %}
{%- set grains_fragment_file = service_name+'/meta/sphinx.yml' %}
{%- macro load_grains_file() %}{% include grains_fragment_file %}{% endmacro %}
{%- set grains_yaml = load_grains_file()|load_yaml %}
{%- do service_grains.sphinx.doc.update({ service_name: grains_yaml.doc }) %}
{%- macro load_grains_file() %}{% include grains_fragment_file ignore missing %}{% endmacro %}
{%- set grains = load_grains_file()|load_yaml %}
{%- if grains %}
{%- set grains_yaml = load_grains_file()|load_yaml %}
{%- do service_grains.sphinx.doc.update({ service_name: grains_yaml.doc }) %}
{%- endif %}
{%- endif %}
{%- endfor %}
{{ service_grains|yaml(False)|indent(4) }}

Cargando…
Cancelar
Guardar