From 4483e7a78d1e37f72322120825fbcffac1a1b376 Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Thu, 18 Dec 2014 15:43:25 +0100 Subject: update db --- global/overlay/etc/puppet/cosmos-db.yaml | 51 +++++++++++++++++--------------- 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'global/overlay/etc/puppet') 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] -- cgit v1.1 From 31b137d7053cf2e96ea3eedbdcd1dbccd5a66562 Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Thu, 18 Dec 2014 15:44:03 +0100 Subject: Added www2.eduid.se. --- global/overlay/etc/puppet/cosmos-rules.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'global/overlay/etc/puppet') 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: -- cgit v1.1 From f61861540da33eba3d631695184c7c72b48e0b94 Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Thu, 18 Dec 2014 16:27:52 +0100 Subject: Added postgres docker. --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'global/overlay/etc/puppet') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index d4229fc..cc7dbd3 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -723,6 +723,19 @@ 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', + } + 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/'], + verify_checksum => false, + } +} + class sunet-cdr { # Listen on br0 if it exists (cdr1), otherwise bond0 (cdr2). -- cgit v1.1 From 00db652a2a3a2257c6d91cb83759e99430cd8122 Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Thu, 18 Dec 2014 16:29:29 +0100 Subject: Removed parameter verify_checksum. --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'global/overlay/etc/puppet') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index cc7dbd3..d7cd7b8 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -732,7 +732,6 @@ node 'sto-tug-kvm2.swamid.se' { 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/'], - verify_checksum => false, } } -- cgit v1.1 From 3d8a9e3940df555ec11d5a6bc9f8da0407f8825f Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Thu, 18 Dec 2014 16:34:39 +0100 Subject: Added ensure directory for flog_db logs. --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'global/overlay/etc/puppet') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index d7cd7b8..cefd3c5 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -728,6 +728,9 @@ node 'sto-tug-kvm2.swamid.se' { 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, -- cgit v1.1