Browse Source

Fix meta/salt.yml to workaround broken formulas

Change-Id: If8ee6ccfd282d8f926eff268cd74871e0f400754
pull/70/head
Filip Pytloun 7 years ago
parent
commit
84d46739a7
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      salt/map.jinja
  2. +1
    -1
      salt/meta/salt.yml

+ 1
- 1
salt/map.jinja View File

virt_pkgs: virt_pkgs:
- libvirt-dev - libvirt-dev
- pkg-config - pkg-config
{% if grains.oscodename == 'trusty' %}
{% if grains.get('oscodename') == 'trusty' %}
- libguestfs-tools - libguestfs-tools
{% endif %} {% endif %}



+ 1
- 1
salt/meta/salt.yml View File

{%- macro load_grains_file() %}{% include grains_fragment_file ignore missing %}{% endmacro %} {%- macro load_grains_file() %}{% include grains_fragment_file ignore missing %}{% endmacro %}
{%- set grains_yaml = load_grains_file()|load_yaml %} {%- set grains_yaml = load_grains_file()|load_yaml %}
{%- if grains_yaml is mapping %} {%- if grains_yaml is mapping %}
{%- for node in grains_yaml.graph %}
{%- for node in grains_yaml.graph if grains_yaml.graph %}
{%- do service_grains.salt.graph.append(node) %} {%- do service_grains.salt.graph.append(node) %}
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}

Loading…
Cancel
Save