From b4b1247f99d5daf07b2a8dca45c8dcac63e8ba55 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 26 May 2014 12:05:55 +0200 Subject: add VM backup-tug-3.eduid.se on cdr1.sunet.se --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 27 +++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 63462a7..85b80bc 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -44,11 +44,11 @@ node default { node 'sto-tug-kvm1.swamid.se' { - + package {'python-vm-builder': ensure => 'installed', - } -> - + } -> + cosmos::dhcp_kvm { 'registry.swamid.se': mac => '52:54:00:52:53:0b', repo => 'git://git.nordu.net/sunet-ops.git', @@ -316,6 +316,9 @@ class sunet-dhcp-hosts { 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" } + # SUNET TUG eduID hosts (KVM host cdr1.sunet.se) + dhcp::host { 'backup-tug-3': mac => "52:54:00:f2:7d:54", ip => "130.242.125.84" } + # SWAMID production dhcp::host { 'registry.swamid': mac => "52:54:00:52:53:0b", ip => "130.242.125.90" } } @@ -468,6 +471,24 @@ node 'wp.sunet.se' { } } +node 'cdr1.sunet.se' { + + package {'python-vm-builder': + ensure => 'installed', + } -> + + cosmos::dhcp_kvm { 'backup-tug-3.eduid.se': + mac => '52:54:00:f2:7d:54', + repo => 'git://git.nordu.net/sunet-ops.git', + tagpattern => 'sunet-ops', + cpus => '1', + memory => '512', + suite => 'trusty', + extras => '--addpkg linux-image-generic --tmpfs -', + } + +} + class sunet-cdr { class { 'dhcp': -- cgit v1.1 From 0587cb33bf04c1726244558e0e33130dd9c64849 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 26 May 2014 12:37:47 +0200 Subject: try suite saucy for backup-tug-3 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 85b80bc..6b05558 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -483,7 +483,7 @@ node 'cdr1.sunet.se' { tagpattern => 'sunet-ops', cpus => '1', memory => '512', - suite => 'trusty', + suite => 'saucy', # trusty not installable on cdr1 running 12.04 extras => '--addpkg linux-image-generic --tmpfs -', } -- cgit v1.1 From 54bf7433d52dcee910e67df729b4041c6c80356c Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 26 May 2014 12:41:31 +0200 Subject: correct cosmos repo and tag pattern for backup-tug-3.eduid.se --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 6b05558..00cc4cf 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -479,8 +479,8 @@ node 'cdr1.sunet.se' { cosmos::dhcp_kvm { 'backup-tug-3.eduid.se': mac => '52:54:00:f2:7d:54', - repo => 'git://git.nordu.net/sunet-ops.git', - tagpattern => 'sunet-ops', + repo => 'git://git.nordu.net/eduid-ops.git', + tagpattern => 'eduid-v3', cpus => '1', memory => '512', suite => 'saucy', # trusty not installable on cdr1 running 12.04 -- cgit v1.1 From ab8b474a1b0f2e1b0e8e2575402dbb27545ef61f Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 26 May 2014 13:41:47 +0200 Subject: try precise on backup-tug-3 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 00cc4cf..e8d2615 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -483,7 +483,7 @@ node 'cdr1.sunet.se' { tagpattern => 'eduid-v3', cpus => '1', memory => '512', - suite => 'saucy', # trusty not installable on cdr1 running 12.04 + suite => 'precise', # newer dists not installable on cdr1 running 12.04 extras => '--addpkg linux-image-generic --tmpfs -', } -- cgit v1.1 From ef688068c066386bf366c1d7c14a820adf5bf307 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Tue, 27 May 2014 10:39:29 +0200 Subject: Figure out best interface to use for DHCP. --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index e8d2615..8e23e76 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -491,11 +491,17 @@ node 'cdr1.sunet.se' { class sunet-cdr { + # Listen on br0 if it exists (cdr1), otherwise bond0 (cdr2). + $interface = $::ipaddress_br0 ? { + undef => 'bond0', + default => 'br0', + } + class { 'dhcp': dnsdomain => [ 'eduid.se','sunet.se','swamid.se' ], nameservers => ['130.242.80.14','130.242.80.99'], ntpservers => ['ntp1.nordu.net','ntp2.nordu.net','Time1.Stupi.SE'], - interfaces => ['bond0'], + interfaces => [$interface], #pxeserver => '130.242.125.5', #pxefilename => 'pxelinux.0' } -- cgit v1.1 From bccd64de10a0eae752cc77648eaa404f6635b600 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Tue, 27 May 2014 12:22:21 +0200 Subject: cdr1 can install trusty VMs now --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 8e23e76..7d0464c 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -483,7 +483,7 @@ node 'cdr1.sunet.se' { tagpattern => 'eduid-v3', cpus => '1', memory => '512', - suite => 'precise', # newer dists not installable on cdr1 running 12.04 + suite => 'trusty', extras => '--addpkg linux-image-generic --tmpfs -', } -- cgit v1.1 From d44a54dd74e8483b941c9a3f48817ddc99a09705 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Tue, 27 May 2014 16:55:03 +0200 Subject: add host proxy-tug-3.eduid.se --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 7d0464c..f77cda6 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -318,6 +318,7 @@ class sunet-dhcp-hosts { # SUNET TUG eduID hosts (KVM host cdr1.sunet.se) dhcp::host { 'backup-tug-3': mac => "52:54:00:f2:7d:54", ip => "130.242.125.84" } + dhcp::host { 'proxy-tug-3': mac => "52:54:00:f2:7d:55", ip => "130.242.125.85" } # SWAMID production dhcp::host { 'registry.swamid': mac => "52:54:00:52:53:0b", ip => "130.242.125.90" } -- cgit v1.1 From 2e3b6120403d52a0aaaa4d81b07fac8469b2b4cd Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Tue, 27 May 2014 16:56:14 +0200 Subject: add kvm guest proxy-tug-3.eduid.se --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index f77cda6..a038528 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -488,6 +488,16 @@ node 'cdr1.sunet.se' { extras => '--addpkg linux-image-generic --tmpfs -', } + cosmos::dhcp_kvm { 'proxy-tug-3.eduid.se': + mac => '52:54:00:f2:7d:55', + repo => 'git://git.nordu.net/eduid-ops.git', + tagpattern => 'eduid-v3', + cpus => '1', + memory => '512', + suite => 'trusty', + extras => '--addpkg linux-image-generic --tmpfs -', + } + } class sunet-cdr { -- cgit v1.1 From 5ae972e64e89a5228856385d0ce6a79d134b3127 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Wed, 4 Jun 2014 14:28:48 +0200 Subject: add eduid-dev nets and hosts --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 91 +++++++++++++++++----- 1 file changed, 72 insertions(+), 19 deletions(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index a038528..46435ac 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -278,36 +278,89 @@ class sunet-dhcp-hosts { # eduID Development subnets - dhcp::pool {'eduid-tug-dev': - network => '194.68.13.128', - mask => '255.255.255.224', - gateway => '194.68.13.129', - range => '', - options => 'domain-name-servers 109.105.111.31, 109.105.110.31', + #dhcp::pool {'eduid-tug-dev': + # network => '194.68.13.128', + # mask => '255.255.255.224', + # gateway => '194.68.13.129', + # range => '', + # options => 'domain-name-servers 109.105.111.31, 109.105.110.31', + #} + + #dhcp::pool {'eduid-fre-dev': + # network => '194.68.13.160', + # mask => '255.255.255.224', + # gateway => '194.68.13.161', + # range => '', + # options => 'domain-name-servers 109.105.111.31, 109.105.110.31', + #} + + dhcp::pool {'eduid-dev-tug-IdP': + network => '130.242.130.192', + mask => '255.255.255.248', + gateway => '130.242.130.201', + range => '' + } + + dhcp::pool {'eduid-dev-tug-auth': + network => '130.242.130.200', + mask => '255.255.255.248', + gateway => '130.242.130.201', + range => '' } - dhcp::pool {'eduid-fre-dev': - network => '194.68.13.160', - mask => '255.255.255.224', - gateway => '194.68.13.161', - range => '', - options => 'domain-name-servers 109.105.111.31, 109.105.110.31', + dhcp::pool {'eduid-dev-tug-other': + network => '130.242.130.208', + mask => '255.255.255.224', + gateway => '130.242.130.209', + range => '' } # eduID TUG development hosts - dhcp::host { 'idp-tug-1': mac => "52:54:00:a0:00:92", ip => "194.68.13.146" } + dhcp::host { 'auth-fre-1_eth0': mac => "78:45:c4:f7:91:67", ip => "130.242.130.204", hostname => 'auth-fre-1'; } + dhcp::host { 'auth-fre-1_eth1': mac => "78:45:c4:f7:91:68", ip => "130.242.130.204", hostname => 'auth-fre-1'; } + + dhcp::host { 'auth-tug-1_eth0': mac => "78:45:c4:f8:43:c5", ip => "130.242.130.205", hostname => 'auth-tug-1'; } + dhcp::host { 'auth-tug-1_eth1': mac => "78:45:c4:f8:43:c6", ip => "130.242.130.205", hostname => 'auth-tug-1'; } + + dhcp::host { 'admin-tug-1': mac => "52:54:00:a0:01:d4", ip => "130.242.130.212" } + + dhcp::host { 'dash-fre-1': mac => "52:54:00:a0:01:d5", ip => "130.242.130.213" } + + dhcp::host { 'idp-fre-1': mac => "52:54:00:a0:01:d6", ip => "130.242.130.214" } + + dhcp::host { 'idp-tug-1': mac => "52:54:00:a0:01:d7", ip => "130.242.130.215" } + + dhcp::host { 'kvm-fre-1_eth0': mac => "78:45:c4:f8:45:15", ip => "130.242.130.216", hostname => 'kvm-fre-1'; } + dhcp::host { 'kvm-fre-1_eth1': mac => "78:45:c4:f8:45:16", ip => "130.242.130.216", hostname => 'kvm-fre-1'; } + + dhcp::host { 'kvm-tug-1_eth0': mac => "78:45:c4:f8:47:be", ip => "130.242.130.217", hostname => 'kvm-tug-1'; } + dhcp::host { 'kvm-tug-1_eth1': mac => "78:45:c4:f8:47:bf", ip => "130.242.130.217", hostname => 'kvm-tug-1'; } + + dhcp::host { 'monitor-fre-1': mac => "52:54:00:a0:01:da", ip => "130.242.130.218" } + + dhcp::host { 'mq-fre-1': mac => "52:54:00:a0:01:db", ip => "130.242.130.219" } + + dhcp::host { 'userdb-fre-1': mac => "52:54:00:a0:01:dc", ip => "130.242.130.220" } + + dhcp::host { 'userdb-tug-1': mac => "52:54:00:a0:01:dd", ip => "130.242.130.221" } + + dhcp::host { 'userdb-tug-2': mac => "52:54:00:a0:01:de", ip => "130.242.130.222" } + + dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:df", ip => "130.242.130.223" } + + #dhcp::host { 'idp-tug-1': mac => "52:54:00:a0:00:92", ip => "194.68.13.146" } - dhcp::host { 'testvm-tug-1': mac => "52:54:00:11:22:33", ip => "194.68.13.136" } + #dhcp::host { 'testvm-tug-1': mac => "52:54:00:11:22:33", ip => "194.68.13.136" } - dhcp::host { 'userdb-tug-1': mac => "52:54:00:93:22:29", ip => "194.68.13.132" } - dhcp::host { 'userdb-tug-2': mac => "52:54:00:17:13:ff", ip => "194.68.13.133" } + #dhcp::host { 'userdb-tug-1': mac => "52:54:00:93:22:29", ip => "194.68.13.132" } + #dhcp::host { 'userdb-tug-2': mac => "52:54:00:17:13:ff", ip => "194.68.13.133" } # eduID FRE development hosts - dhcp::host { 'idp-fre-1': mac => "52:54:00:a1:00:b2", ip => "194.68.13.178" } + #dhcp::host { 'idp-fre-1': mac => "52:54:00:a1:00:b2", ip => "194.68.13.178" } - dhcp::host { 'dash-fre-1': mac => "52:54:00:a2:00:a7", ip => "194.68.13.167" } + #dhcp::host { 'dash-fre-1': mac => "52:54:00:a2:00:a7", ip => "194.68.13.167" } - dhcp::host { 'userdb-fre-1': mac => "52:54:00:17:13:f6", ip => "194.68.13.164" } + #dhcp::host { 'userdb-fre-1': mac => "52:54:00:17:13:f6", ip => "194.68.13.164" } # SUNET TUG hosts -- cgit v1.1 From 2330b01335fa353dc7521bd3d037ad0de703b579 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Wed, 4 Jun 2014 14:34:00 +0200 Subject: fix eduid-dev-tug-other netmask --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 46435ac..14438cc 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -310,7 +310,7 @@ class sunet-dhcp-hosts { dhcp::pool {'eduid-dev-tug-other': network => '130.242.130.208', - mask => '255.255.255.224', + mask => '255.255.255.240', gateway => '130.242.130.209', range => '' } @@ -326,7 +326,8 @@ class sunet-dhcp-hosts { dhcp::host { 'dash-fre-1': mac => "52:54:00:a0:01:d5", ip => "130.242.130.213" } - dhcp::host { 'idp-fre-1': mac => "52:54:00:a0:01:d6", ip => "130.242.130.214" } + #dhcp::host { 'idp-fre-1': mac => "52:54:00:a0:01:d6", ip => "130.242.130.214" } + dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:d6", ip => "130.242.130.214" } dhcp::host { 'idp-tug-1': mac => "52:54:00:a0:01:d7", ip => "130.242.130.215" } @@ -346,7 +347,6 @@ class sunet-dhcp-hosts { dhcp::host { 'userdb-tug-2': mac => "52:54:00:a0:01:de", ip => "130.242.130.222" } - dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:df", ip => "130.242.130.223" } #dhcp::host { 'idp-tug-1': mac => "52:54:00:a0:00:92", ip => "194.68.13.146" } -- cgit v1.1 From ec33d43f8339b0635e786ad90b37cdd9a026b58b Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Thu, 5 Jun 2014 12:10:04 +0200 Subject: change to one big subnet for eduid-dev-tug --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 40 ++++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 14438cc..1e6bc1f 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -294,26 +294,36 @@ class sunet-dhcp-hosts { # options => 'domain-name-servers 109.105.111.31, 109.105.110.31', #} - dhcp::pool {'eduid-dev-tug-IdP': + dhcp::pool {'eduid-dev-tug': network => '130.242.130.192', - mask => '255.255.255.248', - gateway => '130.242.130.201', + mask => '255.255.255.224', + gateway => '130.242.130.193', range => '' } - dhcp::pool {'eduid-dev-tug-auth': - network => '130.242.130.200', - mask => '255.255.255.248', - gateway => '130.242.130.201', - range => '' - } + # One big subnet used for now + #dhcp::pool {'eduid-dev-tug-IdP': + # network => '130.242.130.192', + # mask => '255.255.255.248', + # gateway => '130.242.130.201', + # range => '' + #} - dhcp::pool {'eduid-dev-tug-other': - network => '130.242.130.208', - mask => '255.255.255.240', - gateway => '130.242.130.209', - range => '' - } + # One big subnet used for now + #dhcp::pool {'eduid-dev-tug-auth': + # network => '130.242.130.200', + # mask => '255.255.255.248', + # gateway => '130.242.130.201', + # range => '' + #} + + # One big subnet used for now + #dhcp::pool {'eduid-dev-tug-other': + # network => '130.242.130.208', + # mask => '255.255.255.240', + # gateway => '130.242.130.209', + # range => '' + #} # eduID TUG development hosts dhcp::host { 'auth-fre-1_eth0': mac => "78:45:c4:f7:91:67", ip => "130.242.130.204", hostname => 'auth-fre-1'; } -- cgit v1.1 From d1700b396915613ff4938e3c0e3fa6ccc22af145 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Thu, 5 Jun 2014 12:16:18 +0200 Subject: get back host idp-fre-1 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 1e6bc1f..47c702b 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -336,8 +336,7 @@ class sunet-dhcp-hosts { dhcp::host { 'dash-fre-1': mac => "52:54:00:a0:01:d5", ip => "130.242.130.213" } - #dhcp::host { 'idp-fre-1': mac => "52:54:00:a0:01:d6", ip => "130.242.130.214" } - dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:d6", ip => "130.242.130.214" } + dhcp::host { 'idp-fre-1': mac => "52:54:00:a0:01:d6", ip => "130.242.130.214" } dhcp::host { 'idp-tug-1': mac => "52:54:00:a0:01:d7", ip => "130.242.130.215" } @@ -357,6 +356,7 @@ class sunet-dhcp-hosts { dhcp::host { 'userdb-tug-2': mac => "52:54:00:a0:01:de", ip => "130.242.130.222" } + dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:df", ip => "130.242.130.223" } #dhcp::host { 'idp-tug-1': mac => "52:54:00:a0:00:92", ip => "194.68.13.146" } -- cgit v1.1 From ecb417e8ce9a1eca586e2169c615c2bd30c938f8 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Fri, 13 Jun 2014 10:32:14 +0200 Subject: change worker-fre-1 IP, 130.242.130.223 was broadcast --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/manifests') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 47c702b..07c56b2 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -326,6 +326,8 @@ class sunet-dhcp-hosts { #} # eduID TUG development hosts + dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:c4", ip => "130.242.130.196" } + dhcp::host { 'auth-fre-1_eth0': mac => "78:45:c4:f7:91:67", ip => "130.242.130.204", hostname => 'auth-fre-1'; } dhcp::host { 'auth-fre-1_eth1': mac => "78:45:c4:f7:91:68", ip => "130.242.130.204", hostname => 'auth-fre-1'; } @@ -356,7 +358,6 @@ class sunet-dhcp-hosts { dhcp::host { 'userdb-tug-2': mac => "52:54:00:a0:01:de", ip => "130.242.130.222" } - dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:df", ip => "130.242.130.223" } #dhcp::host { 'idp-tug-1': mac => "52:54:00:a0:00:92", ip => "194.68.13.146" } -- cgit v1.1