diff options
author | Leif Johansson <leifj@sunet.se> | 2014-05-17 14:56:33 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2014-05-17 14:56:33 +0200 |
commit | 757331ad04b07d24e8caabf918a220dc8c7cc062 (patch) | |
tree | 03ad99bdc1f021cb2ff7c913ded9147fdf2a239c | |
parent | 2f2916e15a0f493b72d5cbb0f24ddbc76602b48e (diff) |
reep signersunet-ops-2014-05-17-v01
-rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 24 |
1 files changed, 21 insertions, 3 deletions
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" } |