Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-03-26-v02

2 files changed, 38 insertions, 34 deletions

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 80f4aff..d8a83ca 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -94,6 +94,7 @@ classes:
     sshaccess: null
     sunetops: null
     swamidops: null
+    webserver: null
   web-a1.sunet.se:
     mailclient: *id001
     sshaccess: null
@@ -128,44 +129,45 @@ classes:
     sunetops: 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, 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]
+  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]
   docker_signer: [mdx2.swamid.se]
-  dockerhost: [sto-tug-kvm2.swamid.se, datasets.sunet.se, reep.tid.isoc.org, www2.eduid.se,
-    mdx1.swamid.se, registry.swamid.se, mdx2.swamid.se, docker.sunet.se]
+  dockerhost: [www2.eduid.se, reep.tid.isoc.org, datasets.sunet.se, mdx1.swamid.se,
+    mdx2.swamid.se, sto-tug-kvm2.swamid.se, docker.sunet.se, registry.swamid.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, 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]
+  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]
   quantis: [random1.nordu.net, random2.nordu.net]
   signer: [mdx1.swamid.se]
-  sshaccess: [cdr1.sunet.se, cdr1.sunet.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, 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]
+  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]
   sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
-  sunet::dockerhost: [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,
-    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]
+  sunet::dockerhost: [web-f1.sunet.se, web-db2.sunet.se, web-a1.sunet.se, web-db1.sunet.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]
   webfrontend: [web-f1.sunet.se]
-  webserver: [datasets.sunet.se, registry.swamid.se, docker.sunet.se]
+  webserver: [datasets.sunet.se, sto-tug-kvm2.swamid.se, docker.sunet.se, registry.swamid.se]
 
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 396a110..dc2b9c0 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -29,6 +29,8 @@ mdx2.swamid.se:
    dockerhost:
    docker_signer:
 sto-tug-kvm2.swamid.se:
+   sshaccess:
+   webserver:
    dockerhost:
 reep.tid.isoc.org:
    sshaccess: