1 files changed, 43 insertions, 66 deletions
diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 778f73d..2d48506 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1,192 +1,169 @@
 classes:
   ca.sunet.se:
     mailclient: &id001 {domain: sunet.se}
-    sshaccess: null
     sunetops: null
   cdr1.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet-cdr: null
     sunetops: null
   cdr2.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet-cdr: null
     sunetops: null
   dane.lab.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunetops: null
   datasets.sunet.se:
     dockerhost: null
     mailclient: *id001
-    sshaccess: null
     sunetops: null
     webserver: null
   docker.sunet.se:
     dockerhost: null
     mailclient: *id001
-    sshaccess: null
     sunetops: null
     webserver: null
   lobo2.lab.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunetops: null
   loke.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunetops: null
-  md-master.reep.refeds.org: {sshaccess: null, swamidops: null}
+  md-master.reep.refeds.org: {swamidops: null}
   mdx1.swamid.se:
     dockerhost: null
     mailclient: &id002 {domain: sunet.se}
     signer: null
-    sshaccess: null
     sunetops: null
     swamidops: null
   mdx2.swamid.se:
     docker_signer: null
     dockerhost: null
     mailclient: *id002
-    sshaccess: null
     sunetops: null
     swamidops: null
   meta.swamid.se:
     mailclient: *id002
-    sshaccess: null
     sunetops: null
     swamidops: null
-  random1.nordu.net: {entropyserver: null, quantis: null}
-  random2.nordu.net: {entropyserver: null, quantis: null}
-  reep.tid.isoc.org: {dockerhost: null, sshaccess: null, swamidops: null}
+  random1.nordu.net:
+    entropyserver: null
+    mailclient: &id003 {domain: nordu.net}
+    quantis: null
+    sunetops: null
+  random2.nordu.net:
+    entropyserver: null
+    mailclient: *id003
+    quantis: null
+    sunetops: null
+  reep.tid.isoc.org: {dockerhost: null, swamidops: null}
   registry.swamid.se:
     dockerhost: null
     mailclient: *id002
-    sshaccess: null
     sunetops: null
     swamidops: null
     webserver: null
   samltest.swamid.se:
     mailclient: *id002
-    sshaccess: null
     sunetops: null
     swamidops: null
   sto-fre-kvm1.swamid.se:
     mailclient: *id002
-    sshaccess: null
     sunetops: null
     swamidops: null
   sto-tug-kvm-lab1.swamid.se:
     mailclient: *id002
-    sshaccess: null
     sunetops: null
     swamidops: null
   sto-tug-kvm-lab2.swamid.se:
     mailclient: *id002
-    sshaccess: null
     sunetops: null
     swamidops: null
   sto-tug-kvm1.swamid.se:
     mailclient: *id002
-    sshaccess: null
     sunetops: null
     swamidops: null
   sto-tug-kvm2.swamid.se:
     mailclient: *id002
-    sshaccess: null
     sunet::dockerhost: null
     sunetops: null
     swamidops: null
     webserver: null
   web-a1.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet::dockerhost: null
     sunetops: null
     webappserver: null
   web-a2.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet::dockerhost: null
     sunetops: null
     webappserver: null
   web-db1.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet::dockerhost: null
     sunetops: null
     webbackend: null
   web-db2.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet::dockerhost: null
     sunetops: null
     webbackend: null
   web-db3.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet::dockerhost: null
     sunetops: null
     webbackend: null
   web-f1.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet::dockerhost: null
     sunetops: null
     webfrontend: null
     webserver: null
   web-f2.sunet.se:
     mailclient: *id001
-    sshaccess: null
     sunet::dockerhost: null
     sunetops: null
     webfrontend: null
     webserver: null
   www2.eduid.se: {dockerhost: null}
 members:
-  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]
+  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]
   docker_signer: [mdx2.swamid.se]
-  dockerhost: [datasets.sunet.se, reep.tid.isoc.org, www2.eduid.se, mdx1.swamid.se,
-    registry.swamid.se, mdx2.swamid.se, docker.sunet.se]
+  dockerhost: [datasets.sunet.se, docker.sunet.se, mdx1.swamid.se, mdx2.swamid.se,
+    reep.tid.isoc.org, registry.swamid.se, www2.eduid.se]
   entropyserver: [random1.nordu.net, random2.nordu.net]
-  mailclient: [cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, 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]
+  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]
   quantis: [random1.nordu.net, random2.nordu.net]
   signer: [mdx1.swamid.se]
-  sshaccess: [cdr1.sunet.se, cdr1.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm2.swamid.se,
-    datasets.sunet.se, reep.tid.isoc.org, md-master.reep.refeds.org, 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]
   sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
-  sunet::dockerhost: [sto-tug-kvm2.swamid.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,
-    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]
+  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]
   webbackend: [web-db1.sunet.se, web-db2.sunet.se, web-db3.sunet.se]
   webfrontend: [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]
+  webserver: [datasets.sunet.se, docker.sunet.se, registry.swamid.se, sto-tug-kvm2.swamid.se,
+    web-f1.sunet.se, web-f2.sunet.se]