add eduid-dev nets and hostssunet-ops-2014-06-04-v02

1 files changed, 72 insertions, 19 deletions

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