summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-01-27 14:45:56 +0100
committerLeif Johansson <leifj@sunet.se>2015-01-27 14:45:56 +0100
commitd178d45c3add03be985701137a6d83f379bdaabf (patch)
tree95fd2da9320594cd85e4975ebd57b1a47a2d78a2 /global/overlay/etc/puppet
parent25449bf898f3e2759610f74d416754fae50309eb (diff)
parent3d8a9e3940df555ec11d5a6bc9f8da0407f8825f (diff)
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-01-27-v02
Diffstat (limited to 'global/overlay/etc/puppet')
-rw-r--r--global/overlay/etc/puppet/cosmos-db.yaml51
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml2
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp15
3 files changed, 44 insertions, 24 deletions
diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index ee339a9..de01e88 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -94,34 +94,37 @@ classes:
mailclient: *id001
sshaccess: null
sunetops: null
+ www2.eduid.se: {dockerhost: null}
members:
- all: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, docker.sunet.se,
- cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm-lab1.swamid.se,
- random1.nordu.net, wp.sunet.se, reep.tid.isoc.org, registry.swamid.se, lobo2.lab.sunet.se,
- sto-fre-kvm1.swamid.se, md-master.reep.refeds.org, mdx2.swamid.se, cdr2.sunet.se,
- mdx1.swamid.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net, datasets.sunet.se]
+ all: [cdr1.sunet.se, random1.nordu.net, 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, wp.sunet.se, mdx2.swamid.se, samltest.swamid.se,
+ meta.swamid.se, sto-tug-kvm2.swamid.se, dane.lab.sunet.se, cdr2.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: [docker.sunet.se, sto-tug-kvm2.swamid.se, reep.tid.isoc.org, registry.swamid.se,
- mdx2.swamid.se, mdx1.swamid.se, datasets.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: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, docker.sunet.se,
- cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm-lab1.swamid.se,
- wp.sunet.se, registry.swamid.se, lobo2.lab.sunet.se, sto-fre-kvm1.swamid.se, mdx2.swamid.se,
- cdr2.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab2.swamid.se, datasets.sunet.se]
+ mailclient: [cdr1.sunet.se, sto-tug-kvm-lab2.swamid.se, datasets.sunet.se, mdx1.swamid.se,
+ sto-tug-kvm-lab1.swamid.se, wp.sunet.se, mdx2.swamid.se, samltest.swamid.se, meta.swamid.se,
+ sto-tug-kvm2.swamid.se, dane.lab.sunet.se, cdr2.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: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, docker.sunet.se,
- cdr1.sunet.se, cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm-lab1.swamid.se,
- wp.sunet.se, reep.tid.isoc.org, registry.swamid.se, lobo2.lab.sunet.se, sto-fre-kvm1.swamid.se,
- md-master.reep.refeds.org, mdx2.swamid.se, cdr2.sunet.se, cdr2.sunet.se, mdx1.swamid.se,
- sto-tug-kvm-lab2.swamid.se, datasets.sunet.se]
+ sshaccess: [cdr1.sunet.se, cdr1.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,
+ wp.sunet.se, mdx2.swamid.se, samltest.swamid.se, meta.swamid.se, sto-tug-kvm2.swamid.se,
+ dane.lab.sunet.se, cdr2.sunet.se, cdr2.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]
- sunetops: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, docker.sunet.se,
- cdr1.sunet.se, cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm2.swamid.se, sto-tug-kvm-lab1.swamid.se,
- wp.sunet.se, registry.swamid.se, lobo2.lab.sunet.se, sto-fre-kvm1.swamid.se, mdx2.swamid.se,
- cdr2.sunet.se, cdr2.sunet.se, mdx1.swamid.se, sto-tug-kvm-lab2.swamid.se, datasets.sunet.se]
- swamidops: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, sto-tug-kvm2.swamid.se,
- sto-tug-kvm-lab1.swamid.se, reep.tid.isoc.org, registry.swamid.se, sto-fre-kvm1.swamid.se,
- md-master.reep.refeds.org, mdx2.swamid.se, mdx1.swamid.se, sto-tug-kvm-lab2.swamid.se]
- webserver: [docker.sunet.se, registry.swamid.se, datasets.sunet.se]
+ sunetops: [cdr1.sunet.se, cdr1.sunet.se, sto-tug-kvm-lab2.swamid.se, datasets.sunet.se,
+ mdx1.swamid.se, sto-tug-kvm-lab1.swamid.se, wp.sunet.se, mdx2.swamid.se, samltest.swamid.se,
+ meta.swamid.se, sto-tug-kvm2.swamid.se, dane.lab.sunet.se, cdr2.sunet.se, cdr2.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]
+ webserver: [datasets.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 34ccdfa..8e84028 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -40,3 +40,5 @@ md-master.reep.refeds.org:
'^random\d+\.nordu\.net$':
entropyserver:
quantis:
+www2.eduid.se:
+ dockerhost:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index a393e98..77f59e0 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -723,6 +723,21 @@ node 'cdr1.sunet.se' {
}
+node 'sto-tug-kvm2.swamid.se' {
+ docker::image {'docker.sunet.se/flog/postgresql-9.3': }
+ file {'/opt/docker/postgresql_data':
+ ensure => 'directory',
+ }
+ file {'/var/log/flog_db':
+ ensure => 'directory',
+ }
+ docker::run {'flog_db':
+ image => 'docker.sunet.se/flog/postgresql-9.3',
+ use_name => true,
+ volumes => ['/opt/docker/postgresql_data/:/var/lib/postgresql/','/var/log/flog_db/:/var/log/postgresql/'],
+ }
+}
+
class sunet-cdr {
# Listen on br0 if it exists (cdr1), otherwise bond0 (cdr2).