diff --git a/pillar/salt_cluster/opensuse_or_suse_external.sls b/pillar/salt_cluster/opensuse_or_suse_external.sls deleted file mode 100644 index 792d600..0000000 --- a/pillar/salt_cluster/opensuse_or_suse_external.sls +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/pillar/top.sls b/pillar/top.sls index 0e88ccc..205ad73 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -46,10 +46,7 @@ 'osmajorrelease:(1|4)2': - match: grain_pcre - osmajorrelease.12_or_42 - 'salt_cluster:(opensuse|suse_external)': - - match: grain_pcre - - salt_cluster.opensuse_or_suse_external - {% if salt_cluster == 'opensuse' %} + {% if salt_cluster in ['opensuse', 'geeko'] %} 'salt_cluster:{{ salt_cluster }}': - match: grain - salt_cluster.{{ salt_cluster }}