From dc00aee8db911459a8e10a1d2239cc2f5d74f8e0 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@gmail.com>
Date: Jun 08 2018 10:38:24 +0000
Subject: move shop.o.o to narwal3


https://progress.opensuse.org/issues/30319

---

diff --git a/pillar/id/community_infra_opensuse_org.sls b/pillar/id/community_infra_opensuse_org.sls
index 49c5af2..0c72465 100644
--- a/pillar/id/community_infra_opensuse_org.sls
+++ b/pillar/id/community_infra_opensuse_org.sls
@@ -7,6 +7,5 @@ grains:
     - doc.o.o
     - education.o.o
     - fontinfo.o.o
-    - shop.o.o
   salt_cluster: opensuse
   virt_cluster: atreju
diff --git a/pillar/id/narwal3_infra_opensuse_org.sls b/pillar/id/narwal3_infra_opensuse_org.sls
index c71e073..d104da8 100644
--- a/pillar/id/narwal3_infra_opensuse_org.sls
+++ b/pillar/id/narwal3_infra_opensuse_org.sls
@@ -2,7 +2,10 @@ grains:
   city: nuremberg
   country: de
   hostusage:
+    - html5test.o.o
+    - shop.o.o
     - static.o.o
+    - studioexpress.o.o
   roles:
     - web_static
   salt_cluster: opensuse
diff --git a/pillar/role/web_static.sls b/pillar/role/web_static.sls
index a7e99fb..6b70551 100644
--- a/pillar/role/web_static.sls
+++ b/pillar/role/web_static.sls
@@ -1,4 +1,4 @@
-{% set websites = ['html5test', 'static', 'studioexpress'] %}
+{% set websites = ['html5test', 'shop', 'static', 'studioexpress'] %}
 
 include:
   - role.common.nginx