update dbsunet-ops-2015-11-13-v01

1 files changed, 27 insertions, 22 deletions

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 61f19b2..f731163 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1,4 +1,9 @@
 classes:
+  apps.swamid.se:
+    mailclient: &id002 {domain: sunet.se}
+    nunoc: null
+    sunetops: null
+    swamidops: null
   ca.sunet.se:
     mailclient: &id001 {domain: sunet.se}
     nunoc: null
@@ -29,7 +34,7 @@ classes:
     sunetops: null
     webserver: null
   git.swamid.se:
-    mailclient: &id002 {domain: sunet.se}
+    mailclient: *id002
     nunoc: null
     sunetops: null
     swamidops: null
@@ -167,44 +172,44 @@ classes:
     webfrontend: null
     webserver: null
 members:
-  all: [ca.sunet.se, cdr1.sunet.se, cdr2.sunet.se, dane.lab.sunet.se, datasets.sunet.se,
-    docker.sunet.se, git.swamid.se, lobo2.lab.sunet.se, loke.sunet.se, md-master.reep.refeds.org,
-    mds1.swamid.se, mds2.swamid.se, mdx1.swamid.se, mdx2.swamid.se, meta.swamid.se,
-    random1.nordu.net, random2.nordu.net, registry.swamid.se, samltest.swamid.se,
+  all: [apps.swamid.se, ca.sunet.se, cdr1.sunet.se, cdr2.sunet.se, dane.lab.sunet.se,
+    datasets.sunet.se, docker.sunet.se, git.swamid.se, lobo2.lab.sunet.se, loke.sunet.se,
+    md-master.reep.refeds.org, mds1.swamid.se, mds2.swamid.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]
   dockerhost: [docker.sunet.se, registry.swamid.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, git.swamid.se, lobo2.lab.sunet.se, loke.sunet.se, mds1.swamid.se,
-    mds2.swamid.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]
-  nunoc: [ca.sunet.se, cdr1.sunet.se, cdr2.sunet.se, dane.lab.sunet.se, datasets.sunet.se,
-    docker.sunet.se, git.swamid.se, lobo2.lab.sunet.se, loke.sunet.se, md-master.reep.refeds.org,
+  mailclient: [apps.swamid.se, ca.sunet.se, cdr1.sunet.se, cdr2.sunet.se, dane.lab.sunet.se,
+    datasets.sunet.se, docker.sunet.se, git.swamid.se, lobo2.lab.sunet.se, loke.sunet.se,
     mds1.swamid.se, mds2.swamid.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]
+  nunoc: [apps.swamid.se, ca.sunet.se, cdr1.sunet.se, cdr2.sunet.se, dane.lab.sunet.se,
+    datasets.sunet.se, docker.sunet.se, git.swamid.se, lobo2.lab.sunet.se, loke.sunet.se,
+    md-master.reep.refeds.org, mds1.swamid.se, mds2.swamid.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]
   quantis: [random1.nordu.net, random2.nordu.net]
   sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
   sunet::dockerhost: [sto-tug-kvm2.swamid.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, git.swamid.se, lobo2.lab.sunet.se,
-    loke.sunet.se, mds1.swamid.se, mds2.swamid.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,
+  sunetops: [apps.swamid.se, 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, git.swamid.se,
+    lobo2.lab.sunet.se, loke.sunet.se, mds1.swamid.se, mds2.swamid.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]
   swamid_pyff_signer: [mdx1.swamid.se, mdx2.swamid.se]
   swamid_static_signer: [mds1.swamid.se, mds2.swamid.se]
-  swamidops: [git.swamid.se, md-master.reep.refeds.org, mds1.swamid.se, mds2.swamid.se,
-    mdx1.swamid.se, mdx2.swamid.se, meta.swamid.se, registry.swamid.se, samltest.swamid.se,
-    sto-fre-kvm1.swamid.se, sto-tug-kvm-lab1.swamid.se, sto-tug-kvm-lab2.swamid.se,
+  swamidops: [apps.swamid.se, git.swamid.se, md-master.reep.refeds.org, mds1.swamid.se,
+    mds2.swamid.se, mdx1.swamid.se, mdx2.swamid.se, meta.swamid.se, 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]
   webbackend: [web-db1.sunet.se, web-db2.sunet.se, web-db3.sunet.se]