update dbsunet-ops-2015-09-23-v07

1 files changed, 18 insertions, 23 deletions

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index e4d68da..27de848 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -152,13 +152,9 @@ classes:
     webcommon: null
     webfrontend: null
     webserver: null
-  web.nordu.net:
-    mailclient: *id003
-    nunoc: null
-    sunetops: null
   www2.eduid.se: {dockerhost: null, nunoc: null}
 members:
-  all: [web.nordu.net, cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, reep.tid.isoc.org,
+  all: [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,
@@ -169,31 +165,30 @@ 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: [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,
+  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,
     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]
-  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,
+  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,
     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]
+  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,