update dbsunet-ops-2015-09-15-v04

1 files changed, 33 insertions, 32 deletions

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 2d48506..a706e06 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -14,8 +14,8 @@ classes:
     mailclient: *id001
     sunetops: null
   datasets.sunet.se:
-    dockerhost: null
     mailclient: *id001
+    sunet::dockerhost: null
     sunetops: null
     webserver: null
   docker.sunet.se:
@@ -128,42 +128,43 @@ classes:
     webserver: null
   www2.eduid.se: {dockerhost: null}
 members:
-  all: [ca.sunet.se, cdr1.sunet.se, cdr2.sunet.se, dane.lab.sunet.se, datasets.sunet.se,
-    docker.sunet.se, lobo2.lab.sunet.se, loke.sunet.se, md-master.reep.refeds.org,
-    mdx1.swamid.se, mdx2.swamid.se, meta.swamid.se, random1.nordu.net, random2.nordu.net,
-    reep.tid.isoc.org, registry.swamid.se, samltest.swamid.se, sto-fre-kvm1.swamid.se,
-    sto-tug-kvm-lab1.swamid.se, sto-tug-kvm-lab2.swamid.se, sto-tug-kvm1.swamid.se,
-    sto-tug-kvm2.swamid.se, web-a1.sunet.se, web-a2.sunet.se, web-db1.sunet.se, web-db2.sunet.se,
-    web-db3.sunet.se, web-f1.sunet.se, web-f2.sunet.se, www2.eduid.se]
+  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,
+    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]
   docker_signer: [mdx2.swamid.se]
-  dockerhost: [datasets.sunet.se, docker.sunet.se, mdx1.swamid.se, mdx2.swamid.se,
-    reep.tid.isoc.org, registry.swamid.se, www2.eduid.se]
+  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: [ca.sunet.se, cdr1.sunet.se, cdr2.sunet.se, dane.lab.sunet.se, datasets.sunet.se,
-    docker.sunet.se, lobo2.lab.sunet.se, loke.sunet.se, mdx1.swamid.se, mdx2.swamid.se,
-    meta.swamid.se, random1.nordu.net, random2.nordu.net, registry.swamid.se, samltest.swamid.se,
-    sto-fre-kvm1.swamid.se, sto-tug-kvm-lab1.swamid.se, sto-tug-kvm-lab2.swamid.se,
-    sto-tug-kvm1.swamid.se, sto-tug-kvm2.swamid.se, web-a1.sunet.se, web-a2.sunet.se,
-    web-db1.sunet.se, web-db2.sunet.se, web-db3.sunet.se, web-f1.sunet.se, web-f2.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, web-a1.sunet.se, web-a2.sunet.se, web-db1.sunet.se,
-    web-db2.sunet.se, web-db3.sunet.se, web-f1.sunet.se, web-f2.sunet.se]
-  sunetops: [ca.sunet.se, cdr1.sunet.se, cdr1.sunet.se, cdr2.sunet.se, cdr2.sunet.se,
-    dane.lab.sunet.se, datasets.sunet.se, docker.sunet.se, lobo2.lab.sunet.se, loke.sunet.se,
-    mdx1.swamid.se, mdx2.swamid.se, meta.swamid.se, random1.nordu.net, random2.nordu.net,
-    registry.swamid.se, samltest.swamid.se, sto-fre-kvm1.swamid.se, sto-tug-kvm-lab1.swamid.se,
-    sto-tug-kvm-lab2.swamid.se, sto-tug-kvm1.swamid.se, sto-tug-kvm2.swamid.se, web-a1.sunet.se,
-    web-a2.sunet.se, web-db1.sunet.se, web-db2.sunet.se, web-db3.sunet.se, web-f1.sunet.se,
-    web-f2.sunet.se]
-  swamidops: [md-master.reep.refeds.org, mdx1.swamid.se, mdx2.swamid.se, meta.swamid.se,
-    reep.tid.isoc.org, registry.swamid.se, samltest.swamid.se, sto-fre-kvm1.swamid.se,
-    sto-tug-kvm-lab1.swamid.se, sto-tug-kvm-lab2.swamid.se, sto-tug-kvm1.swamid.se,
-    sto-tug-kvm2.swamid.se]
-  webappserver: [web-a1.sunet.se, web-a2.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]
   webfrontend: [web-f1.sunet.se, web-f2.sunet.se]
-  webserver: [datasets.sunet.se, docker.sunet.se, registry.swamid.se, sto-tug-kvm2.swamid.se,
-    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]