Browse Source
Fix meta/salt.yml to workaround broken formulas
Change-Id: I6b6fbaaebd3e349bf76aa05cb9eb2004a842d9c5pull/132/head
Filip Pytloun
7 years ago
1 changed files with 6 additions and 3 deletions
+ 6
- 3
linux/meta/salt.yml
View File
| {%- for service_name, service in pillar.items() %} | {%- for service_name, service in pillar.items() %} | ||||
| {%- if service.get('_support', {}).get('sphinx', {}).get('enabled', False) %} | {%- if service.get('_support', {}).get('sphinx', {}).get('enabled', False) %} | ||||
| {%- set grains_fragment_file = service_name+'/meta/sphinx.yml' %} | {%- 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 %} | {%- endif %} | ||||
| {%- endfor %} | {%- endfor %} | ||||
| {{ service_grains|yaml(False)|indent(4) }} | {{ service_grains|yaml(False)|indent(4) }} |
Loading…