Przeglądaj źródła

Fix installing cross-formula dependencies

Change-Id: I6a56167d7b887c0e876fb6af65903f87043e8214
pull/73/head
Vasyl Saienko 6 lat temu
rodzic
commit
f241bb7779
1 zmienionych plików z 10 dodań i 7 usunięć
  1. +10
    -7
      salt/minion/service.sls

+ 10
- 7
salt/minion/service.sls Wyświetl plik

@@ -60,19 +60,21 @@ salt_minion_config_{{ service_name }}_{{ name }}_validity_check:
{%- endfor %}
{%- endif %}

{%- if support_yaml and support_yaml.get('dependency', {}) %}
{%- if support_yaml.get('engine', 'pkg') == 'pkg' %}
{%- if support_yaml %}
{%- set dependency = support_yaml.get('dependency') %}
{%- if dependency %}
{%- if dependency.get('engine', 'pkg') == 'pkg' %}

salt_minion_{{ service_name }}_dependencies:
pkg.installed:
- names: {{ support_yaml.pkgs }}
- names: {{ dependency.get('pkgs') }}
- onchanges_in:
- cmd: salt_minion_service_restart
{%- elif support_yaml.engine == 'pip' %}
{%- if support_yaml.get('pkgs') %}
{%- elif dependency.get('engine', 'pkg') == 'pip' %}
{%- if dependency.get('pkgs') %}
salt_minion_{{ service_name }}_dependencies:
pip.installed:
- names: {{ support_yaml.pkgs }}
- names: {{ dependency.get('pkgs') }}
- onchanges_in:
- cmd: salt_minion_service_restart
- require_in:
@@ -81,12 +83,13 @@ salt_minion_{{ service_name }}_dependencies:

salt_minion_{{ service_name }}_dependencies_pip:
pip.installed:
- names: {{ support_yaml.python_pkgs }}
- names: {{ dependency.get('python_pkgs') }}
- onchanges_in:
- cmd: salt_minion_service_restart

{%- endif %}
{%- endif %}
{%- endif %}
{%- endfor %}

salt_minion_service:

Ładowanie…
Anuluj
Zapisz