From 1ba32b84b7200361ededcdd9d131d5cdd184413b Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Feb 04 2020 12:50:47 +0000 Subject: Get rid of empty pillar/country/ --- diff --git a/pillar/country/de-qsc.sls b/pillar/country/de-qsc.sls deleted file mode 100644 index 792d600..0000000 --- a/pillar/country/de-qsc.sls +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/pillar/country/de.sls b/pillar/country/de.sls deleted file mode 100644 index 792d600..0000000 --- a/pillar/country/de.sls +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/pillar/country/us.sls b/pillar/country/us.sls deleted file mode 100644 index 792d600..0000000 --- a/pillar/country/us.sls +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/pillar/top.sls b/pillar/top.sls index f9823f8..ce92a5c 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -1,5 +1,4 @@ {% from "macros.jinja" import valid_virt_cluster with context %} -{% set country = salt['grains.get']('country') %} {% set domain = salt['grains.get']('domain') %} {% set id = salt['grains.get']('id') %} {% set osfullname = salt['grains.get']('osfullname') %} @@ -29,9 +28,6 @@ 'virtual:{{ virtual }}': - match: grain - virtual.{{ virtual }} - 'country:{{ country }}': - - match: grain - - country.{{ country }} {% if domain and domain == 'infra.opensuse.org' %} 'domain:{{ domain }}': - match: grain