diff options
| author | Fredrik Thulin <fredrik@thulin.net> | 2014-05-26 11:47:59 +0200 |
|---|---|---|
| committer | Fredrik Thulin <fredrik@thulin.net> | 2014-05-26 11:47:59 +0200 |
| commit | 9b27b9f2542d8e065e194736d008aa2cdb1c4cfc (patch) | |
| tree | ee39ef5a52b0e6b24cc5bf4de82df06d0ab38231 /global/overlay/etc/puppet/cosmos-db.yaml | |
| parent | 15476295654c13802503ba10110663580a80de76 (diff) | |
| parent | 266039ca73ee423630610ccbd16046bd52545379 (diff) | |
Merge remote-tracking branch 'remotes/origin/master'sunet-ops-2014-05-26-v01
Diffstat (limited to 'global/overlay/etc/puppet/cosmos-db.yaml')
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-db.yaml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 08055f5..f522aa4 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -2,6 +2,7 @@ classes: cdr1.sunet.se: {sunet: null, sunet-cdr: null} cdr2.sunet.se: {sunet: null, sunet-cdr: null} dane.lab.sunet.se: {} + md-master.reep.refeds.org: {sunet: null, swamidops: null} meta.swamid.se: {sunet: null, swamidops: null} random1.nordu.net: {entropyserver: null, quantis: null, sunet: null} random2.nordu.net: {entropyserver: null, quantis: null, sunet: null} @@ -14,13 +15,14 @@ classes: members: all: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, random1.nordu.net, wp.sunet.se, - registry.swamid.se, cdr2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net] + registry.swamid.se, md-master.reep.refeds.org, cdr2.sunet.se, sto-tug-kvm-lab2.swamid.se, + random2.nordu.net] entropyserver: [random1.nordu.net, random2.nordu.net] quantis: [random1.nordu.net, random2.nordu.net] sunet: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, cdr1.sunet.se, - sto-tug-kvm-lab1.swamid.se, random1.nordu.net, registry.swamid.se, cdr2.sunet.se, - sto-tug-kvm-lab2.swamid.se, random2.nordu.net] + sto-tug-kvm-lab1.swamid.se, random1.nordu.net, registry.swamid.se, md-master.reep.refeds.org, + cdr2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net] sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se] swamidops: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, sto-tug-kvm-lab1.swamid.se, - registry.swamid.se, sto-tug-kvm-lab2.swamid.se] + registry.swamid.se, md-master.reep.refeds.org, sto-tug-kvm-lab2.swamid.se] |