diff --git a/pillar/country/us.sls b/pillar/country/us.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/country/us.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/id/riesling2_infra_opensuse_org.sls b/pillar/id/riesling2_infra_opensuse_org.sls
new file mode 100644
index 0000000..d761123
--- /dev/null
+++ b/pillar/id/riesling2_infra_opensuse_org.sls
@@ -0,0 +1,9 @@
+grains:
+  city: provo
+  country: us
+  roles:
+    - mysql
+    - wiki
+    - wiki_readonly
+  salt_cluster: opensuse
+  virt_cluster: bryce
diff --git a/pillar/id/water2_infra_opensuse_org.sls b/pillar/id/water2_infra_opensuse_org.sls
new file mode 100644
index 0000000..2f719f1
--- /dev/null
+++ b/pillar/id/water2_infra_opensuse_org.sls
@@ -0,0 +1,7 @@
+grains:
+  city: provo
+  country: us
+  roles:
+    - wikisearch
+  salt_cluster: opensuse
+  virt_cluster: bryce
diff --git a/pillar/role/wiki_readonly.sls b/pillar/role/wiki_readonly.sls
new file mode 100644
index 0000000..feb276f
--- /dev/null
+++ b/pillar/role/wiki_readonly.sls
@@ -0,0 +1,52 @@
+# include this in addition to to "wiki" role
+
+# Note that wiki_readonly also uses a different elasticsearch and mysql server
+
+mediawiki_1_27:
+  # 192.168.67.9 is water2.infra.opensuse.org
+  elasticsearch_server: 192.168.67.9
+  mysql_server: 127.0.0.1
+  wikis:
+    cn:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    cs:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    de:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    el:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    en:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    en-test:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    es:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    fr:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    hu:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    it:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    ja:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    languages:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    nl:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+# old-de: # readonly anyway
+# old-en: # readonly anyway
+    pl:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    pt:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    ru:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    sv:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    tr:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    zh:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+    zh-tw:
+      readonly_msg: "During the power outage in Nuremberg, the wiki is read-only."
+
diff --git a/pillar/virt_cluster/bryce.sls b/pillar/virt_cluster/bryce.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/virt_cluster/bryce.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/virt_cluster/bryce/kvm.sls b/pillar/virt_cluster/bryce/kvm.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/virt_cluster/bryce/kvm.sls
@@ -0,0 +1 @@
+#
diff --git a/salt/role/wiki_readonly.sls b/salt/role/wiki_readonly.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/salt/role/wiki_readonly.sls
@@ -0,0 +1 @@
+#