update dbsunet-ops-2015-09-23-v11

1 files changed, 16 insertions, 23 deletions

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 931c1e8..a4551f9 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -68,7 +68,6 @@ classes:
     nunoc: null
     quantis: null
     sunetops: null
-  reep.tid.isoc.org: {dockerhost: null, nunoc: null, swamidops: null}
   registry.swamid.se:
     dockerhost: null
     mailclient: *id002
@@ -152,36 +151,31 @@ classes:
     webcommon: null
     webfrontend: null
     webserver: null
-  web.nordu.net:
-    mailclient: *id003
-    nunoc: null
-    sunetops: null
   www2.eduid.se: {nunoc: null}
 members:
   all: [ca.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db3.sunet.se, random1.nordu.net,
     web-db2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net, www2.eduid.se,
-    md-master.reep.refeds.org, reep.tid.isoc.org, datasets.sunet.se, mdx1.swamid.se,
-    sto-tug-kvm-lab1.swamid.se, web-a1.sunet.se, mdx2.swamid.se, samltest.swamid.se,
-    web-db1.sunet.se, meta.swamid.se, sto-tug-kvm2.swamid.se, web-f2.sunet.se, dane.lab.sunet.se,
-    cdr2.sunet.se, web-a2.sunet.se, loke.sunet.se, docker.sunet.se, sto-fre-kvm1.swamid.se,
-    registry.swamid.se, sto-tug-kvm1.swamid.se, web.nordu.net, lobo2.lab.sunet.se]
+    md-master.reep.refeds.org, datasets.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se,
+    web-a1.sunet.se, mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se, meta.swamid.se,
+    sto-tug-kvm2.swamid.se, web-f2.sunet.se, dane.lab.sunet.se, cdr2.sunet.se, web-a2.sunet.se,
+    loke.sunet.se, docker.sunet.se, sto-fre-kvm1.swamid.se, registry.swamid.se, sto-tug-kvm1.swamid.se,
+    lobo2.lab.sunet.se]
   docker_signer: [mdx2.swamid.se]
-  dockerhost: [reep.tid.isoc.org, mdx1.swamid.se, mdx2.swamid.se, docker.sunet.se,
-    registry.swamid.se]
+  dockerhost: [mdx1.swamid.se, mdx2.swamid.se, docker.sunet.se, registry.swamid.se]
   entropyserver: [random1.nordu.net, random2.nordu.net]
   mailclient: [ca.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db3.sunet.se, random1.nordu.net,
     web-db2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net, datasets.sunet.se,
     mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se, web-a1.sunet.se, mdx2.swamid.se, samltest.swamid.se,
     web-db1.sunet.se, meta.swamid.se, sto-tug-kvm2.swamid.se, web-f2.sunet.se, dane.lab.sunet.se,
     cdr2.sunet.se, web-a2.sunet.se, loke.sunet.se, docker.sunet.se, sto-fre-kvm1.swamid.se,
-    registry.swamid.se, sto-tug-kvm1.swamid.se, web.nordu.net, lobo2.lab.sunet.se]
+    registry.swamid.se, sto-tug-kvm1.swamid.se, lobo2.lab.sunet.se]
   nunoc: [ca.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db3.sunet.se, random1.nordu.net,
     web-db2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net, www2.eduid.se,
-    md-master.reep.refeds.org, reep.tid.isoc.org, datasets.sunet.se, mdx1.swamid.se,
-    sto-tug-kvm-lab1.swamid.se, web-a1.sunet.se, mdx2.swamid.se, samltest.swamid.se,
-    web-db1.sunet.se, meta.swamid.se, sto-tug-kvm2.swamid.se, web-f2.sunet.se, dane.lab.sunet.se,
-    cdr2.sunet.se, web-a2.sunet.se, loke.sunet.se, docker.sunet.se, sto-fre-kvm1.swamid.se,
-    registry.swamid.se, sto-tug-kvm1.swamid.se, web.nordu.net, lobo2.lab.sunet.se]
+    md-master.reep.refeds.org, datasets.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se,
+    web-a1.sunet.se, mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se, meta.swamid.se,
+    sto-tug-kvm2.swamid.se, web-f2.sunet.se, dane.lab.sunet.se, cdr2.sunet.se, web-a2.sunet.se,
+    loke.sunet.se, docker.sunet.se, sto-fre-kvm1.swamid.se, registry.swamid.se, sto-tug-kvm1.swamid.se,
+    lobo2.lab.sunet.se]
   quantis: [random1.nordu.net, random2.nordu.net]
   signer: [mdx1.swamid.se]
   sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
@@ -192,11 +186,10 @@ members:
     mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se, meta.swamid.se, sto-tug-kvm2.swamid.se,
     web-f2.sunet.se, dane.lab.sunet.se, cdr2.sunet.se, cdr2.sunet.se, web-a2.sunet.se,
     loke.sunet.se, docker.sunet.se, sto-fre-kvm1.swamid.se, registry.swamid.se, sto-tug-kvm1.swamid.se,
-    web.nordu.net, lobo2.lab.sunet.se]
-  swamidops: [sto-tug-kvm-lab2.swamid.se, md-master.reep.refeds.org, reep.tid.isoc.org,
-    mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se, mdx2.swamid.se, samltest.swamid.se,
-    meta.swamid.se, sto-tug-kvm2.swamid.se, sto-fre-kvm1.swamid.se, registry.swamid.se,
-    sto-tug-kvm1.swamid.se]
+    lobo2.lab.sunet.se]
+  swamidops: [sto-tug-kvm-lab2.swamid.se, md-master.reep.refeds.org, mdx1.swamid.se,
+    sto-tug-kvm-lab1.swamid.se, mdx2.swamid.se, samltest.swamid.se, meta.swamid.se,
+    sto-tug-kvm2.swamid.se, sto-fre-kvm1.swamid.se, registry.swamid.se, sto-tug-kvm1.swamid.se]
   webappserver: [web-a1.sunet.se, web-a2.sunet.se]
   webbackend: [web-db3.sunet.se, web-db2.sunet.se, web-db1.sunet.se]
   webcommon: [web-f1.sunet.se, web-db3.sunet.se, web-db2.sunet.se, web-a1.sunet.se,