update dbsunet-ops-2014-10-24-v10

1 files changed, 46 insertions, 25 deletions

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 76a4720..c7da7f2 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1,61 +1,81 @@
 classes:
-  cdr1.sunet.se: {sunet: null, sunet-cdr: null}
-  cdr2.sunet.se: {sunet: null, sunet-cdr: null}
-  dane.lab.sunet.se: {}
-  datasets.sunet.se: {dockerhost: null, sunet: null, webserver: null}
-  docker.sunet.se: {dockerhost: null, sunet: null, webserver: null}
-  lobo2.lab.sunet.se: {}
+  cdr1.sunet.se:
+    mailclient: &id001 {domain: sunet.se}
+    sunet: null
+    sunet-cdr: null
+  cdr2.sunet.se:
+    mailclient: *id001
+    sunet: null
+    sunet-cdr: null
+  dane.lab.sunet.se:
+    mailclient: *id001
+    sunet: null
+  datasets.sunet.se:
+    dockerhost: null
+    mailclient: *id001
+    sunet: null
+    webserver: null
+  docker.sunet.se:
+    dockerhost: null
+    mailclient: *id001
+    sunet: null
+    webserver: null
+  lobo2.lab.sunet.se:
+    mailclient: *id001
+    sunet: null
   md-master.reep.refeds.org: {sunet: null, swamidops: null}
   mdx1.swamid.se:
     dockerhost: null
-    mailclient: &id001 {domain: sunet.se}
+    mailclient: &id002 {domain: sunet.se}
     signer: null
     sunet: null
     swamidops: null
   mdx2.swamid.se:
     docker_signer: null
     dockerhost: null
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
   meta.swamid.se:
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
-  random1.nordu.net: {entropyserver: null, quantis: null, sunet: null}
-  random2.nordu.net: {entropyserver: null, quantis: null, sunet: null}
+  random1.nordu.net: {entropyserver: null, quantis: null}
+  random2.nordu.net: {entropyserver: null, quantis: null}
   registry.swamid.se:
     dockerhost: null
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
     webserver: null
   samltest.swamid.se:
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
   sto-fre-kvm1.swamid.se:
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
   sto-tug-kvm-lab1.swamid.se:
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
   sto-tug-kvm-lab2.swamid.se:
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
   sto-tug-kvm1.swamid.se:
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
   sto-tug-kvm2.swamid.se:
     dockerhost: null
-    mailclient: *id001
+    mailclient: *id002
     sunet: null
     swamidops: null
-  wp.sunet.se: {}
+  wp.sunet.se:
+    mailclient: *id001
+    sunet: null
 members:
   all: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, docker.sunet.se,
     cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm-lab1.swamid.se,
@@ -66,15 +86,16 @@ members:
   dockerhost: [docker.sunet.se, sto-tug-kvm2.swamid.se, registry.swamid.se, mdx2.swamid.se,
     mdx1.swamid.se, datasets.sunet.se]
   entropyserver: [random1.nordu.net, random2.nordu.net]
-  mailclient: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, sto-tug-kvm2.swamid.se,
-    sto-tug-kvm-lab1.swamid.se, registry.swamid.se, sto-fre-kvm1.swamid.se, mdx2.swamid.se,
-    mdx1.swamid.se, sto-tug-kvm-lab2.swamid.se]
+  mailclient: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, docker.sunet.se,
+    cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm-lab1.swamid.se,
+    wp.sunet.se, registry.swamid.se, lobo2.lab.sunet.se, sto-fre-kvm1.swamid.se, mdx2.swamid.se,
+    cdr2.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab2.swamid.se, datasets.sunet.se]
   quantis: [random1.nordu.net, random2.nordu.net]
   signer: [mdx1.swamid.se]
   sunet: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, docker.sunet.se,
-    cdr1.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm-lab1.swamid.se, random1.nordu.net,
-    registry.swamid.se, sto-fre-kvm1.swamid.se, md-master.reep.refeds.org, mdx2.swamid.se,
-    cdr2.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net,
+    cdr1.sunet.se, cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm-lab1.swamid.se,
+    wp.sunet.se, registry.swamid.se, lobo2.lab.sunet.se, sto-fre-kvm1.swamid.se, md-master.reep.refeds.org,
+    mdx2.swamid.se, cdr2.sunet.se, cdr2.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab2.swamid.se,
     datasets.sunet.se]
   sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
   swamidops: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, sto-tug-kvm2.swamid.se,