1 files changed, 32 insertions, 28 deletions
diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 9d8b951..e4d68da 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -20,7 +20,6 @@ classes:
   datasets.sunet.se:
     mailclient: *id001
     nunoc: null
-    sunet::dockerhost: null
     sunetops: null
     webserver: null
   docker.sunet.se:
@@ -112,50 +111,54 @@ classes:
   web-a1.sunet.se:
     mailclient: *id001
     nunoc: null
-    sunet::dockerhost: null
     sunetops: null
     webappserver: null
+    webcommon: null
   web-a2.sunet.se:
     mailclient: *id001
     nunoc: null
-    sunet::dockerhost: null
     sunetops: null
     webappserver: null
+    webcommon: null
   web-db1.sunet.se:
     mailclient: *id001
     nunoc: null
-    sunet::dockerhost: null
     sunetops: null
     webbackend: null
+    webcommon: null
   web-db2.sunet.se:
     mailclient: *id001
     nunoc: null
-    sunet::dockerhost: null
     sunetops: null
     webbackend: null
+    webcommon: null
   web-db3.sunet.se:
     mailclient: *id001
     nunoc: null
-    sunet::dockerhost: null
     sunetops: null
     webbackend: null
+    webcommon: null
   web-f1.sunet.se:
     mailclient: *id001
     nunoc: null
-    sunet::dockerhost: null
     sunetops: null
+    webcommon: null
     webfrontend: null
     webserver: null
   web-f2.sunet.se:
     mailclient: *id001
     nunoc: null
-    sunet::dockerhost: null
     sunetops: null
+    webcommon: null
     webfrontend: null
     webserver: null
+  web.nordu.net:
+    mailclient: *id003
+    nunoc: null
+    sunetops: null
   www2.eduid.se: {dockerhost: null, nunoc: null}
 members:
-  all: [cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, reep.tid.isoc.org,
+  all: [web.nordu.net, cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, reep.tid.isoc.org,
     random1.nordu.net, md-master.reep.refeds.org, random2.nordu.net, sto-tug-kvm-lab2.swamid.se,
     sto-tug-kvm1.swamid.se, ca.sunet.se, web-a2.sunet.se, loke.sunet.se, www2.eduid.se,
     cdr2.sunet.se, web-db1.sunet.se, web-db2.sunet.se, mdx1.swamid.se, web-f1.sunet.se,
@@ -166,38 +169,39 @@ members:
   dockerhost: [reep.tid.isoc.org, www2.eduid.se, mdx1.swamid.se, registry.swamid.se,
     mdx2.swamid.se, docker.sunet.se]
   entropyserver: [random1.nordu.net, random2.nordu.net]
-  mailclient: [cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, random1.nordu.net,
-    random2.nordu.net, sto-tug-kvm-lab2.swamid.se, sto-tug-kvm1.swamid.se, ca.sunet.se,
-    web-a2.sunet.se, loke.sunet.se, cdr2.sunet.se, web-db1.sunet.se, web-db2.sunet.se,
+  mailclient: [web.nordu.net, cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se,
+    random1.nordu.net, random2.nordu.net, sto-tug-kvm-lab2.swamid.se, sto-tug-kvm1.swamid.se,
+    ca.sunet.se, web-a2.sunet.se, loke.sunet.se, cdr2.sunet.se, web-db1.sunet.se,
+    web-db2.sunet.se, mdx1.swamid.se, web-f1.sunet.se, web-f2.sunet.se, meta.swamid.se,
+    registry.swamid.se, dane.lab.sunet.se, mdx2.swamid.se, samltest.swamid.se, docker.sunet.se,
+    lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, sto-fre-kvm1.swamid.se, web-db3.sunet.se,
+    web-a1.sunet.se]
+  nunoc: [web.nordu.net, cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se,
+    reep.tid.isoc.org, random1.nordu.net, md-master.reep.refeds.org, random2.nordu.net,
+    sto-tug-kvm-lab2.swamid.se, sto-tug-kvm1.swamid.se, ca.sunet.se, web-a2.sunet.se,
+    loke.sunet.se, www2.eduid.se, cdr2.sunet.se, web-db1.sunet.se, web-db2.sunet.se,
     mdx1.swamid.se, web-f1.sunet.se, web-f2.sunet.se, meta.swamid.se, registry.swamid.se,
     dane.lab.sunet.se, mdx2.swamid.se, samltest.swamid.se, docker.sunet.se, lobo2.lab.sunet.se,
     sto-tug-kvm-lab1.swamid.se, sto-fre-kvm1.swamid.se, web-db3.sunet.se, web-a1.sunet.se]
-  nunoc: [cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, reep.tid.isoc.org,
-    random1.nordu.net, md-master.reep.refeds.org, random2.nordu.net, sto-tug-kvm-lab2.swamid.se,
-    sto-tug-kvm1.swamid.se, ca.sunet.se, web-a2.sunet.se, loke.sunet.se, www2.eduid.se,
+  quantis: [random1.nordu.net, random2.nordu.net]
+  signer: [mdx1.swamid.se]
+  sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
+  sunet::dockerhost: [sto-tug-kvm2.swamid.se]
+  sunetops: [web.nordu.net, cdr1.sunet.se, cdr1.sunet.se, sto-tug-kvm2.swamid.se,
+    datasets.sunet.se, random1.nordu.net, random2.nordu.net, sto-tug-kvm-lab2.swamid.se,
+    sto-tug-kvm1.swamid.se, ca.sunet.se, web-a2.sunet.se, loke.sunet.se, cdr2.sunet.se,
     cdr2.sunet.se, web-db1.sunet.se, web-db2.sunet.se, mdx1.swamid.se, web-f1.sunet.se,
     web-f2.sunet.se, meta.swamid.se, registry.swamid.se, dane.lab.sunet.se, mdx2.swamid.se,
     samltest.swamid.se, docker.sunet.se, lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se,
     sto-fre-kvm1.swamid.se, web-db3.sunet.se, web-a1.sunet.se]
-  quantis: [random1.nordu.net, random2.nordu.net]
-  signer: [mdx1.swamid.se]
-  sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
-  sunet::dockerhost: [sto-tug-kvm2.swamid.se, datasets.sunet.se, web-a2.sunet.se,
-    web-db1.sunet.se, web-db2.sunet.se, web-f1.sunet.se, web-f2.sunet.se, web-db3.sunet.se,
-    web-a1.sunet.se]
-  sunetops: [cdr1.sunet.se, cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se,
-    random1.nordu.net, random2.nordu.net, sto-tug-kvm-lab2.swamid.se, sto-tug-kvm1.swamid.se,
-    ca.sunet.se, web-a2.sunet.se, loke.sunet.se, cdr2.sunet.se, cdr2.sunet.se, web-db1.sunet.se,
-    web-db2.sunet.se, mdx1.swamid.se, web-f1.sunet.se, web-f2.sunet.se, meta.swamid.se,
-    registry.swamid.se, dane.lab.sunet.se, mdx2.swamid.se, samltest.swamid.se, docker.sunet.se,
-    lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, sto-fre-kvm1.swamid.se, web-db3.sunet.se,
-    web-a1.sunet.se]
   swamidops: [sto-tug-kvm2.swamid.se, reep.tid.isoc.org, md-master.reep.refeds.org,
     sto-tug-kvm-lab2.swamid.se, sto-tug-kvm1.swamid.se, mdx1.swamid.se, meta.swamid.se,
     registry.swamid.se, mdx2.swamid.se, samltest.swamid.se, sto-tug-kvm-lab1.swamid.se,
     sto-fre-kvm1.swamid.se]
   webappserver: [web-a2.sunet.se, web-a1.sunet.se]
   webbackend: [web-db1.sunet.se, web-db2.sunet.se, web-db3.sunet.se]
+  webcommon: [web-a2.sunet.se, web-db1.sunet.se, web-db2.sunet.se, web-f1.sunet.se,
+    web-f2.sunet.se, web-db3.sunet.se, web-a1.sunet.se]
   webfrontend: [web-f1.sunet.se, web-f2.sunet.se]
   webserver: [sto-tug-kvm2.swamid.se, datasets.sunet.se, web-f1.sunet.se, web-f2.sunet.se,
     registry.swamid.se, docker.sunet.se]