diff options
| author | Georg Pfuetzenreuter | 2023-01-21 14:20:08 +0100 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-01-21 14:26:31 +0100 |
| commit | 12f0a7bce0b2ed747a0a3e5e6df1d8e7104b8b33 (patch) | |
| tree | 9a7053856c086f4e9e3496b219a2a8632339c728 | |
| parent | 91fd60c5a3124184352ad47aa33679cd9c7cbb6d (diff) | |
| download | salt-12f0a7bce0b2ed747a0a3e5e6df1d8e7104b8b33.tar.gz salt-12f0a7bce0b2ed747a0a3e5e6df1d8e7104b8b33.tar.bz2 salt-12f0a7bce0b2ed747a0a3e5e6df1d8e7104b8b33.zip | |
Target roles without grains in tops
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
| -rw-r--r-- | pillar/top.sls | 8 | ||||
| -rw-r--r-- | salt/top.sls | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pillar/top.sls b/pillar/top.sls index 872dc8b..3302bd8 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -4,11 +4,9 @@ {{ saltenv }}: '*': - common - {% for role in roles %} - 'roles:{{ role }}': - - match: grain - - role.{{ role }} - {%- endfor %} '{{ id }}': - ignore_missing: True - id.{{ id.replace('.', '_') }} + {% for role in roles %} + - role.{{ role }} + {%- endfor %} diff --git a/salt/top.sls b/salt/top.sls index a534cc5..632d4a2 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -4,8 +4,9 @@ {{ saltenv }}: '*': - common + {%- if roles | length > 0 %} + '{{ id }}': {% for role in roles %} - 'roles:{{ role }}': - - match: grain - role.{{ role }} - {% endfor %} + {%- endfor %} + {%- endif %} |