Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-01-v07

2 files changed, 67 insertions, 35 deletions

diff --git a/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/trurl.mnt.se.csr b/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/trurl.mnt.se.csr
new file mode 100644
index 0000000..b700311
--- /dev/null
+++ b/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/trurl.mnt.se.csr
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEozCCAosCAQAwNDELMAkGA1UEBhMCU0UxDjAMBgNVBAoTBVNVTkVUMRUwEwYD
+VQQDEwx0cnVybC5tbnQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQC/jVPMKs6TRQixhkmqLI7/mJUsV4UjRE5K32IeiyMUK97UZV2lovm88+bUToQB
+Q76/QfS7WDeBiH2ULszvEheuFr327kQqUrDF8yGDRoE7/jpFrUqAt+wqCLbMt0qF
+lImBeA+Nq6vTVe5Pr9newPOZgj2kD+uaWQvwuCFZ4U5M8O4MI+YbgmaUMmRK65us
+jnBDZEgQhtUS0pWVWzb3a7Gpq68cRNgWv35Q1GPs/2OKKgCFeExy8mBLNIBUt5Wn
+mrdZn+UEdAXP6XNXatNqH1F+k33sqo58mengSFVmiqHEg3OL7OPsj3swu9wHjWjS
+ZWh+0BDUPGuEHCnO86E8Qd7WmtkEKB7WHzlerM9fyDpmjxPDLgbjp0HVYsGw1MnO
+GXJWDef3h4UiwLHBnNZ3TU25nqA7eTXqRhEDuHhlp8ZeSbNGkFrvlNowa7VQvYfl
+Wv0fbIN8XQZ/naUjZ2qen5m272ZmkqBWVHZjRYhNAYCNXxLId7ycLZd++Rny3tHq
+ZJUDdWjEyXcjQYPOXRIGfMOYGEFMyfHjAn7Sd9IyJqRHLFKnSCLnlo2aTAk928va
+pdyQ7UXsncV7fcj4DoAs0mBAD+6qTg+fw3c9/5ySnfvuWkLIctVZeWvpWPGM/+o5
+7KvC+z2zSqqyXjimvGP7+SX6y1EoS3c3KVQYPLEWwc0zVQIDAQABoCowKAYJKoZI
+hvcNAQkOMRswGTAXBgNVHREEEDAOggx0cnVybC5tbnQuc2UwDQYJKoZIhvcNAQEL
+BQADggIBAIKdHFKlBbHUFMI6t4wyxFuuAipQG8DaXKLx9KCzEOqc8AjIp2p1BjWm
+SsB2UaK+ndWDmtnqv8fcZO8z+QhI4YUxEJaIN2BFjeyMg2SeA4eBixzPVEFjrlqA
+fR1eV/KSV/LWYPSZpBKw8bYY3LfOTLOI+HESOPWHb2n6QDCz6DN5kq06YsDeFa8m
+FUz06lL7BSeY8wb9JQzm7PRJr3AwrDim6vf11ol2SI+kM70ufX3sFOJTQSS0PyKr
+YQLUlP8sv1nBOgCZk0+Li+PW6Rq81fTgGuceRBdPEGLlsWuDOmfAONOBIrMjW+9B
+SmDeMyzCtbfoCBXdRAiOeIDDs2v5AJoHhIEogfN+1VGHS+4XuPZXSN9ipcom/DcG
+96njdtT+tpH1kUcwBP1r65HCgYNcno+ZZENOafA4qJ4MhaAE9IaWYtj4aGwxgxrV
+/BJgvhVXUa9KJoeu6LaZyKmkTIVVmI8NjgLE+YFkGP37Cv2T/XlZnJsZroCaM69R
+nhubBeDNAuAWZdw3qc42bE4sZWX9TaTSlxENiyct7xKoTHtarN7VYkCagfGZSOaz
+14sN8IClKgxYFNtSnnulmPuBUjD+mfU+V6vK6CzAF2dePjsb9zIg4hEBTOnsmzVB
+DOezEqvFxtyILXqK+oPbsNKt06aGPHb6v8bSPPG5jCyHlfckkcn3
+-----END CERTIFICATE REQUEST-----
diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index a84fd5f..a66bc05 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -33,6 +33,10 @@ classes:
     mailclient: *id001
     sshaccess: null
     sunetops: null
+  loke.sunet.se:
+    mailclient: *id001
+    sshaccess: null
+    sunetops: null
   md-master.reep.refeds.org: {sshaccess: null, swamidops: null}
   mdx1.swamid.se:
     dockerhost: null
@@ -129,45 +133,46 @@ classes:
     sunetops: null
   www2.eduid.se: {dockerhost: null}
 members:
-  all: [ca.sunet.se, cdr1.sunet.se, web-f1.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, wp.sunet.se, mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se,
-    meta.swamid.se, sto-tug-kvm2.swamid.se, dane.lab.sunet.se, cdr2.sunet.se, web-a2.sunet.se,
-    docker.sunet.se, sto-fre-kvm1.swamid.se, registry.swamid.se, sto-tug-kvm1.swamid.se,
-    lobo2.lab.sunet.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,
+    meta.swamid.se, registry.swamid.se, dane.lab.sunet.se, mdx2.swamid.se, samltest.swamid.se,
+    wp.sunet.se, docker.sunet.se, lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se,
+    sto-fre-kvm1.swamid.se, web-a1.sunet.se]
   docker_signer: [mdx2.swamid.se]
-  dockerhost: [www2.eduid.se, reep.tid.isoc.org, datasets.sunet.se, mdx1.swamid.se,
-    mdx2.swamid.se, docker.sunet.se, registry.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]
   entropyserver: [random1.nordu.net, random2.nordu.net]
-  mailclient: [ca.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db2.sunet.se, sto-tug-kvm-lab2.swamid.se,
-    datasets.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se, web-a1.sunet.se,
-    wp.sunet.se, mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se, meta.swamid.se,
-    sto-tug-kvm2.swamid.se, dane.lab.sunet.se, cdr2.sunet.se, web-a2.sunet.se, docker.sunet.se,
-    sto-fre-kvm1.swamid.se, registry.swamid.se, sto-tug-kvm1.swamid.se, lobo2.lab.sunet.se]
+  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, meta.swamid.se,
+    registry.swamid.se, dane.lab.sunet.se, mdx2.swamid.se, samltest.swamid.se, wp.sunet.se,
+    docker.sunet.se, lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, sto-fre-kvm1.swamid.se,
+    web-a1.sunet.se]
   quantis: [random1.nordu.net, random2.nordu.net]
   signer: [mdx1.swamid.se]
-  sshaccess: [ca.sunet.se, cdr1.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db2.sunet.se,
-    sto-tug-kvm-lab2.swamid.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, wp.sunet.se, mdx2.swamid.se,
-    samltest.swamid.se, web-db1.sunet.se, meta.swamid.se, sto-tug-kvm2.swamid.se,
-    sto-tug-kvm2.swamid.se, dane.lab.sunet.se, cdr2.sunet.se, cdr2.sunet.se, web-a2.sunet.se,
-    docker.sunet.se, sto-fre-kvm1.swamid.se, registry.swamid.se, sto-tug-kvm1.swamid.se,
-    lobo2.lab.sunet.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,
+    meta.swamid.se, registry.swamid.se, dane.lab.sunet.se, mdx2.swamid.se, samltest.swamid.se,
+    wp.sunet.se, docker.sunet.se, lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se,
+    sto-fre-kvm1.swamid.se, web-a1.sunet.se]
   sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
-  sunet::dockerhost: [web-f1.sunet.se, web-db2.sunet.se, web-a1.sunet.se, web-db1.sunet.se,
-    sto-tug-kvm2.swamid.se, web-a2.sunet.se]
-  sunetops: [ca.sunet.se, cdr1.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db2.sunet.se,
-    sto-tug-kvm-lab2.swamid.se, datasets.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se,
-    web-a1.sunet.se, wp.sunet.se, mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se,
-    meta.swamid.se, sto-tug-kvm2.swamid.se, dane.lab.sunet.se, cdr2.sunet.se, cdr2.sunet.se,
-    web-a2.sunet.se, docker.sunet.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, 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]
-  webappserver: [web-a1.sunet.se, web-a2.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-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, meta.swamid.se, registry.swamid.se, dane.lab.sunet.se,
+    mdx2.swamid.se, samltest.swamid.se, wp.sunet.se, docker.sunet.se, lobo2.lab.sunet.se,
+    sto-tug-kvm-lab1.swamid.se, sto-fre-kvm1.swamid.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]
   webfrontend: [web-f1.sunet.se]
-  webserver: [datasets.sunet.se, sto-tug-kvm2.swamid.se, docker.sunet.se, registry.swamid.se]
+  webserver: [sto-tug-kvm2.swamid.se, datasets.sunet.se, registry.swamid.se, docker.sunet.se]