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(-) 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