Merge branch 'master' of git.nordu.net:nunoc-opssunet-ops-2015-09-23-v13

2 files changed, 38 insertions, 41 deletions

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 88a7511..a4551f9 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -151,51 +151,50 @@ classes:
     webcommon: null
     webfrontend: null
     webserver: null
-  www2.eduid.se: {dockerhost: null, nunoc: null}
+  www2.eduid.se: {nunoc: null}
 members:
-  all: [cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, 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, web-f1.sunet.se, web-db3.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, datasets.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se,
+    web-a1.sunet.se, mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se, meta.swamid.se,
+    sto-tug-kvm2.swamid.se, web-f2.sunet.se, dane.lab.sunet.se, cdr2.sunet.se, web-a2.sunet.se,
+    loke.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: [www2.eduid.se, mdx1.swamid.se, registry.swamid.se, mdx2.swamid.se,
-    docker.sunet.se]
+  dockerhost: [mdx1.swamid.se, mdx2.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, random1.nordu.net,
-    random2.nordu.net, 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]
-  nunoc: [cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, 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]
+  mailclient: [ca.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db3.sunet.se, random1.nordu.net,
+    web-db2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net, datasets.sunet.se,
+    mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se, web-a1.sunet.se, mdx2.swamid.se, samltest.swamid.se,
+    web-db1.sunet.se, meta.swamid.se, sto-tug-kvm2.swamid.se, web-f2.sunet.se, dane.lab.sunet.se,
+    cdr2.sunet.se, web-a2.sunet.se, loke.sunet.se, docker.sunet.se, sto-fre-kvm1.swamid.se,
+    registry.swamid.se, sto-tug-kvm1.swamid.se, lobo2.lab.sunet.se]
+  nunoc: [ca.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db3.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, datasets.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se,
+    web-a1.sunet.se, mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se, meta.swamid.se,
+    sto-tug-kvm2.swamid.se, web-f2.sunet.se, dane.lab.sunet.se, cdr2.sunet.se, web-a2.sunet.se,
+    loke.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]
   sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se]
   sunet::dockerhost: [sto-tug-kvm2.swamid.se]
-  sunetops: [cdr1.sunet.se, cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se,
-    random1.nordu.net, random2.nordu.net, 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, 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]
-  webbackend: [web-db1.sunet.se, web-db2.sunet.se, web-db3.sunet.se]
-  webcommon: [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: [ca.sunet.se, cdr1.sunet.se, cdr1.sunet.se, web-f1.sunet.se, web-db3.sunet.se,
+    random1.nordu.net, web-db2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net,
+    datasets.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se, web-a1.sunet.se,
+    mdx2.swamid.se, samltest.swamid.se, web-db1.sunet.se, meta.swamid.se, sto-tug-kvm2.swamid.se,
+    web-f2.sunet.se, dane.lab.sunet.se, cdr2.sunet.se, cdr2.sunet.se, web-a2.sunet.se,
+    loke.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, 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]
+  webbackend: [web-db3.sunet.se, web-db2.sunet.se, web-db1.sunet.se]
+  webcommon: [web-f1.sunet.se, web-db3.sunet.se, web-db2.sunet.se, web-a1.sunet.se,
+    web-db1.sunet.se, web-f2.sunet.se, web-a2.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: [web-f1.sunet.se, datasets.sunet.se, sto-tug-kvm2.swamid.se, web-f2.sunet.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 0172675..718ce2a 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -37,8 +37,6 @@ md-master.reep.refeds.org:
 '^random\d+\.nordu\.net$':
    entropyserver:
    quantis:
-www2.eduid.se:
-   dockerhost:
 '^web-.+\.sunet\.se$':
    webcommon:
 '^web-a[0-9]+\.sunet\.se$':