Added userdb-tug-{12} and removed tabs from the filesunet-ops-2014-02-10-v01

1 files changed, 38 insertions, 35 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index d5067c5..e3a8ac0 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -147,61 +147,61 @@ class sunet-dhcp-hosts {
 
    # eduID TUG hosts
 
-   dhcp::host { 'kvmidp-tug-2_eth0':	mac => "24:b6:fd:fe:fa:51", ip => "130.242.130.4", hostname => 'kvmidp-tug-2'; }
-   dhcp::host { 'kvmidp-tug-2_eth1':	mac => "24:b6:fd:fe:fa:52", ip => "130.242.130.4", hostname => 'kvmidp-tug-2'; }
+   dhcp::host { 'kvmidp-tug-2_eth0':  mac => "24:b6:fd:fe:fa:51", ip => "130.242.130.4", hostname => 'kvmidp-tug-2'; }
+   dhcp::host { 'kvmidp-tug-2_eth1':  mac => "24:b6:fd:fe:fa:52", ip => "130.242.130.4", hostname => 'kvmidp-tug-2'; }
 
-   dhcp::host { 'idp-tug-2a':		mac => "52:54:00:01:00:01", ip => "130.242.130.5"; }
+   dhcp::host { 'idp-tug-2a':   mac => "52:54:00:01:00:01", ip => "130.242.130.5"; }
 
-   dhcp::host { 'idp-tug-2b':		mac => "52:54:00:01:00:02", ip => "130.242.130.6"; }
+   dhcp::host { 'idp-tug-2b':   mac => "52:54:00:01:00:02", ip => "130.242.130.6"; }
 
-   dhcp::host { 'auth-tug-2_eth0':	mac => "f0:4d:a2:73:4e:9b", ip => "130.242.130.12", hostname => 'auth-tug-2'; }
-   dhcp::host { 'auth-tug-2_eth1':	mac => "f0:4d:a2:73:4e:9c", ip => "130.242.130.12", hostname => 'auth-tug-2'; }
+   dhcp::host { 'auth-tug-2_eth0':  mac => "f0:4d:a2:73:4e:9b", ip => "130.242.130.12", hostname => 'auth-tug-2'; }
+   dhcp::host { 'auth-tug-2_eth1':  mac => "f0:4d:a2:73:4e:9c", ip => "130.242.130.12", hostname => 'auth-tug-2'; }
 
-   dhcp::host { 'kvm-tug-2_eth0':	mac => "f0:4d:a2:73:4f:82", ip => "130.242.130.20", hostname => 'kvm-tug-2'; }
-   dhcp::host { 'kvm-tug-2_eth1':	mac => "f0:4d:a2:73:4f:83", ip => "130.242.130.20", hostname => 'kvm-tug-2'; }
+   dhcp::host { 'kvm-tug-2_eth0': mac => "f0:4d:a2:73:4f:82", ip => "130.242.130.20", hostname => 'kvm-tug-2'; }
+   dhcp::host { 'kvm-tug-2_eth1': mac => "f0:4d:a2:73:4f:83", ip => "130.242.130.20", hostname => 'kvm-tug-2'; }
 
-   dhcp::host { 'db-tug-2_eth0':	mac => "24:b6:fd:fe:fa:f0", ip => "130.242.130.21", hostname => 'db-tug-2'; }
-   dhcp::host { 'db-tug-2_eth1':	mac => "24:b6:fd:fe:fa:f1", ip => "130.242.130.21", hostname => 'db-tug-2'; }
+   dhcp::host { 'db-tug-2_eth0':  mac => "24:b6:fd:fe:fa:f0", ip => "130.242.130.21", hostname => 'db-tug-2'; }
+   dhcp::host { 'db-tug-2_eth1':  mac => "24:b6:fd:fe:fa:f1", ip => "130.242.130.21", hostname => 'db-tug-2'; }
 
-   dhcp::host { 'mq-tug-2':		mac => "52:54:00:03:00:22", ip => "130.242.130.22"; }
+   dhcp::host { 'mq-tug-2':   mac => "52:54:00:03:00:22", ip => "130.242.130.22"; }
 
-   dhcp::host { 'worker-tug-2':		mac => "52:54:00:03:00:23", ip => "130.242.130.23"; }
+   dhcp::host { 'worker-tug-2':   mac => "52:54:00:03:00:23", ip => "130.242.130.23"; }
 
-   dhcp::host { 'signup-tug-2':		mac => "52:54:00:03:00:24", ip => "130.242.130.24"; }
+   dhcp::host { 'signup-tug-2':   mac => "52:54:00:03:00:24", ip => "130.242.130.24"; }
 
-   dhcp::host { 'helpdesk-tug-2':	mac => "52:54:00:03:00:25", ip => "130.242.130.25"; }
+   dhcp::host { 'helpdesk-tug-2': mac => "52:54:00:03:00:25", ip => "130.242.130.25"; }
 
-   dhcp::host { 'www-tug-2':		mac => "52:54:00:03:00:26", ip => "130.242.130.26"; }
+   dhcp::host { 'www-tug-2':    mac => "52:54:00:03:00:26", ip => "130.242.130.26"; }
 
-   dhcp::host { 'dashboard-tug-2_eth0':	mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30", hostname => 'dashboard-tug-2'; }
-   dhcp::host { 'dashboard-tug-2_eth1':	mac => "f0:4d:a2:73:4f:0e", ip => "130.242.130.30", hostname => 'dashboard-tug-2'; }
+   dhcp::host { 'dashboard-tug-2_eth0': mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30", hostname => 'dashboard-tug-2'; }
+   dhcp::host { 'dashboard-tug-2_eth1': mac => "f0:4d:a2:73:4f:0e", ip => "130.242.130.30", hostname => 'dashboard-tug-2'; }
 
 
    # eduID FRE hosts
 
-   dhcp::host { 'kvmidp-fre-2_eth0':	mac => "18:03:73:41:f3:e8", ip => "130.242.130.68", hostname => 'kvmidp-fre-2'; }
-   dhcp::host { 'kvmidp-fre-2_eth1':	mac => "18:03:73:41:f3:e9", ip => "130.242.130.68", hostname => 'kvmidp-fre-2'; }
+   dhcp::host { 'kvmidp-fre-2_eth0':  mac => "18:03:73:41:f3:e8", ip => "130.242.130.68", hostname => 'kvmidp-fre-2'; }
+   dhcp::host { 'kvmidp-fre-2_eth1':  mac => "18:03:73:41:f3:e9", ip => "130.242.130.68", hostname => 'kvmidp-fre-2'; }
 
-   dhcp::host { 'idp-fre-2a':		mac => "52:54:00:04:00:01", ip => "130.242.130.69"; }
+   dhcp::host { 'idp-fre-2a':   mac => "52:54:00:04:00:01", ip => "130.242.130.69"; }
 
-   dhcp::host { 'idp-fre-2b':		mac => "52:54:00:04:00:02", ip => "130.242.130.70"; }
+   dhcp::host { 'idp-fre-2b':   mac => "52:54:00:04:00:02", ip => "130.242.130.70"; }
 
-   dhcp::host { 'auth-fre-2_eth0':	mac => "18:03:73:0f:41:3c", ip => "130.242.130.76", hostname => 'auth-fre-2'; }
-   dhcp::host { 'auth-fre-2_eth1':	mac => "18:03:73:0f:41:3d", ip => "130.242.130.76", hostname => 'auth-fre-2'; }
+   dhcp::host { 'auth-fre-2_eth0':  mac => "18:03:73:0f:41:3c", ip => "130.242.130.76", hostname => 'auth-fre-2'; }
+   dhcp::host { 'auth-fre-2_eth1':  mac => "18:03:73:0f:41:3d", ip => "130.242.130.76", hostname => 'auth-fre-2'; }
 
-   dhcp::host { 'kvm-fre-2_eth0':	mac => "f0:4d:a2:73:4b:e3", ip => "130.242.130.84", hostname => 'kvm-fre-2'; }
-   dhcp::host { 'kvm-fre-2_eth1':	mac => "f0:4d:a2:73:4b:e4", ip => "130.242.130.84", hostname => 'kvm-fre-2'; }
+   dhcp::host { 'kvm-fre-2_eth0': mac => "f0:4d:a2:73:4b:e3", ip => "130.242.130.84", hostname => 'kvm-fre-2'; }
+   dhcp::host { 'kvm-fre-2_eth1': mac => "f0:4d:a2:73:4b:e4", ip => "130.242.130.84", hostname => 'kvm-fre-2'; }
 
-   dhcp::host { 'www-fre-2':		mac => "52:54:00:06:00:01", ip => "130.242.130.86"; }
+   dhcp::host { 'www-fre-2':    mac => "52:54:00:06:00:01", ip => "130.242.130.86"; }
 
-   dhcp::host { 'db-fre-2_eth0':	mac => "f0:4d:a2:73:4f:19", ip => "130.242.130.85", hostname => 'db-fre-2'; }
-   dhcp::host { 'db-fre-2_eth1':	mac => "f0:4d:a2:73:4f:1a", ip => "130.242.130.85", hostname => 'db-fre-2'; }
+   dhcp::host { 'db-fre-2_eth0':  mac => "f0:4d:a2:73:4f:19", ip => "130.242.130.85", hostname => 'db-fre-2'; }
+   dhcp::host { 'db-fre-2_eth1':  mac => "f0:4d:a2:73:4f:1a", ip => "130.242.130.85", hostname => 'db-fre-2'; }
 
 
    # eduID LLA hosts
 
-   dhcp::host { 'db-lla-2_eth0':	mac => "f0:4d:a2:73:4e:08", ip => "130.242.130.148", hostname => 'db-lla-2'; }
-   dhcp::host { 'db-lla-2_eth1':	mac => "f0:4d:a2:73:4e:09", ip => "130.242.130.148", hostname => 'db-lla-2'; }
+   dhcp::host { 'db-lla-2_eth0':  mac => "f0:4d:a2:73:4e:08", ip => "130.242.130.148", hostname => 'db-lla-2'; }
+   dhcp::host { 'db-lla-2_eth1':  mac => "f0:4d:a2:73:4e:09", ip => "130.242.130.148", hostname => 'db-lla-2'; }
 
 
 
@@ -223,16 +223,19 @@ class sunet-dhcp-hosts {
    }
 
    # eduID TUG development hosts
-   dhcp::host { 'idp-tug-1':		mac => "52:54:00:a0:00:92", ip => "194.68.13.146" }
+   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" }
 
    # 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" }
 
 }