From 8d5a27b848230b929064902b784119856fb7893b Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Thu, 24 Sep 2015 15:27:35 +0200 Subject: Sort members by name in cosmos-db.yaml --- fabfile/db.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fabfile/db.py b/fabfile/db.py index 129aa50..081764d 100644 --- a/fabfile/db.py +++ b/fabfile/db.py @@ -32,6 +32,10 @@ def _load_db(): node_classes.update(cls) classes[node_name] = node_classes + # Sort member lists for a more easy to read diff + for cls in members.keys(): + members[cls].sort() + return dict(classes=classes,members=members) _db = None -- cgit v1.1 From af6cf96c5ea6c7646cadf3447624594f0fe65726 Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Thu, 24 Sep 2015 15:33:46 +0200 Subject: update db --- global/overlay/etc/puppet/cosmos-db.yaml | 76 ++++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index b574d46..61f19b2 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -167,50 +167,50 @@ classes: webfrontend: null webserver: 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, mds1.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, - git.swamid.se, docker.sunet.se, lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, - sto-fre-kvm1.swamid.se, web-db3.sunet.se, mds2.swamid.se, web-a1.sunet.se] - dockerhost: [registry.swamid.se, docker.sunet.se] + 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, + 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: [cdr1.sunet.se, sto-tug-kvm2.swamid.se, datasets.sunet.se, random1.nordu.net, - random2.nordu.net, sto-tug-kvm-lab2.swamid.se, mds1.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, git.swamid.se, - docker.sunet.se, lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, sto-fre-kvm1.swamid.se, - web-db3.sunet.se, mds2.swamid.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, mds1.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, - git.swamid.se, docker.sunet.se, lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, - sto-fre-kvm1.swamid.se, web-db3.sunet.se, mds2.swamid.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, 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, + 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: [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, mds1.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, git.swamid.se, docker.sunet.se, lobo2.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, - sto-fre-kvm1.swamid.se, web-db3.sunet.se, mds2.swamid.se, web-a1.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, 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: [sto-tug-kvm2.swamid.se, md-master.reep.refeds.org, sto-tug-kvm-lab2.swamid.se, - mds1.swamid.se, sto-tug-kvm1.swamid.se, mdx1.swamid.se, meta.swamid.se, registry.swamid.se, - mdx2.swamid.se, samltest.swamid.se, git.swamid.se, sto-tug-kvm-lab1.swamid.se, - sto-fre-kvm1.swamid.se, mds2.swamid.se] - webappserver: [web-a2.sunet.se, web-a1.sunet.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, + 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] - 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] + webcommon: [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] 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] -- cgit v1.1