From 2f2916e15a0f493b72d5cbb0f24ddbc76602b48e Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 16 May 2014 13:21:04 +0200 Subject: ip address fix for kvm1 and more modules --- global/overlay/etc/puppet/cosmos-modules.conf | 1 + global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'global') diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf index f378327..7a95b31 100644 --- a/global/overlay/etc/puppet/cosmos-modules.conf +++ b/global/overlay/etc/puppet/cosmos-modules.conf @@ -21,3 +21,4 @@ wordpress hunner/wordpress no mysql puppetlabs/mysql no apache puppetlabs/apache no pyff git://github.com/samlbits/puppet-pyff.git yes sunet-* +postgresql git://github.com/SUNET/puppetlabs-postgresql.git yes sunet-* diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index f17a254..ab60653 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -73,6 +73,14 @@ node 'registry.swamid.se' { python::pip { 'peer==0.13.0': virtualenv => '/opt/peer' } + + class { 'postgresql::server': } + + postgresql::server::db { 'peer': + encoding => 'utf-8', + user => 'peer', + password => postgresql_password('peer', hiera('peer_db_password')), + } } node 'sto-tug-kvm-lab1.swamid.se' { -- cgit v1.1 From 757331ad04b07d24e8caabf918a220dc8c7cc062 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sat, 17 May 2014 14:56:33 +0200 Subject: reep signer --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'global') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index ab60653..985bc38 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -56,6 +56,23 @@ node 'sto-tug-kvm1.swamid.se' { cpus => '1', memory => '2048', } + + cosmos::dhcp_kvm { 'md-master.reep.refeds.org': + mac => '52:54:00:39:8d:ac', + repo => 'git://git.nordu.net/sunet-ops.git', + tagpattern => 'sunet-ops', + cpus => '1', + memory => '2048', + } +} + +node 'md-master.reep.refeds.org' { + include cosmos::httpsproxy + class {'pyff': + load => ['/opt/peer/vf_repo'], + validUntil => 'P10D', + cacheDuration => 'PT5H' + } } node 'registry.swamid.se' { @@ -294,9 +311,10 @@ class sunet-dhcp-hosts { # SUNET TUG hosts - dhcp::host { 'samltest': mac => "52:54:00:3a:0a:e4", ip => "130.242.125.80" } - dhcp::host { 'dane.lab': mac => "52:54:00:8d:88:5f", ip => "130.242.125.81" } - dhcp::host { 'meta.swamid': mac => "52:54:00:1c:72:1a", ip => "130.242.125.82" } + dhcp::host { 'samltest': mac => "52:54:00:3a:0a:e4", ip => "130.242.125.80" } + dhcp::host { 'dane.lab': mac => "52:54:00:8d:88:5f", ip => "130.242.125.81" } + dhcp::host { 'meta.swamid': mac => "52:54:00:1c:72:1a", ip => "130.242.125.82" } + dhcp::host { 'md-master.reep': mac => "52:54:00:39:8d:ac", ip => "130.242.125.83" } # SWAMID production dhcp::host { 'registry.swamid': mac => "52:54:00:52:53:0b", ip => "130.242.125.90" } -- cgit v1.1 From cf094ae86fde369fc1f13930ddf47f9ca9eff52a Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sat, 17 May 2014 18:51:01 +0200 Subject: update db --- global/overlay/etc/puppet/cosmos-db.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'global') diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 08055f5..3afe255 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: {} 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,7 +15,8 @@ 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, -- cgit v1.1 From 3812d32ed5c811f583ef39c1d65e4a8c1c75677c Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sat, 17 May 2014 18:56:25 +0200 Subject: need to fix pound first --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'global') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 985bc38..c973dbf 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -67,7 +67,7 @@ node 'sto-tug-kvm1.swamid.se' { } node 'md-master.reep.refeds.org' { - include cosmos::httpsproxy + #include cosmos::httpsproxy class {'pyff': load => ['/opt/peer/vf_repo'], validUntil => 'P10D', @@ -76,7 +76,7 @@ node 'md-master.reep.refeds.org' { } node 'registry.swamid.se' { - include cosmos::httpsproxy + #include cosmos::httpsproxy class {'pyff': load => ['/opt/peer/vf_repo'], validUntil => 'P10D', -- cgit v1.1 From 26466613eabaf6a4cf4a871e457de79709690c42 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sat, 17 May 2014 18:58:35 +0200 Subject: need to setup hiera first --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'global') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index c973dbf..63462a7 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -91,13 +91,13 @@ node 'registry.swamid.se' { virtualenv => '/opt/peer' } - class { 'postgresql::server': } + #class { 'postgresql::server': } - postgresql::server::db { 'peer': - encoding => 'utf-8', - user => 'peer', - password => postgresql_password('peer', hiera('peer_db_password')), - } + #postgresql::server::db { 'peer': + # encoding => 'utf-8', + # user => 'peer', + # password => postgresql_password('peer', hiera('peer_db_password')), + #} } node 'sto-tug-kvm-lab1.swamid.se' { -- cgit v1.1 From 90b30eeb725761a236afb314e907b7d3600c460c Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sat, 17 May 2014 19:08:31 +0200 Subject: assign classes --- global/overlay/etc/puppet/cosmos-rules.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'global') diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 0346b4d..36476b1 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -7,6 +7,9 @@ '\.swamid\.se$': sunet: swamidops: +md-master.reep.refeds.org: + sunet: + swamidops: '^random\d+\.nordu\.net$': entropyserver: quantis: -- cgit v1.1 From 266039ca73ee423630610ccbd16046bd52545379 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sat, 17 May 2014 19:08:36 +0200 Subject: update db --- global/overlay/etc/puppet/cosmos-db.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'global') diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 3afe255..f522aa4 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -2,7 +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: {} + 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} @@ -20,9 +20,9 @@ members: 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] -- cgit v1.1