Reformat and add all eth1 mac addresses.sunet-ops-2013-11-07-v05

1 files changed, 24 insertions, 52 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 0d942aa..afdfeba 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -122,84 +122,56 @@ node 'sto-tug-kvm1.swamid.se' {
       range => ''
    }
 
+
    # eduID TUG hosts
 
-   dhcp::host {
-     'kvmidp-tug-2': mac => "24:b6:fd:fe:fa:51", ip => "130.242.130.4";
-   }
+   dhcp::host { 'kvmidp-tug-2':		mac => "24:b6:fd:fe:fa:51", ip => "130.242.130.4"; }
+   #dhcp::host { 'kvmidp-tug-2':	mac => "24:b6:fd:fe:fa:52", ip => "130.242.130.4"; }
 
-   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': mac => "f0:4d:a2:73:4e:9b", ip => "130.242.130.12"; }
-   #dhcp::host { 'auth-tug-2': mac => "f0:4d:a2:73:4e:9c", ip => "130.242.130.12"; }
+   dhcp::host { 'auth-tug-2':		mac => "f0:4d:a2:73:4e:9b", ip => "130.242.130.12"; }
+   #dhcp::host { 'auth-tug-2':		mac => "f0:4d:a2:73:4e:9c", ip => "130.242.130.12"; }
 
-   dhcp::host {
-     'kvm-tug-2': mac => "f0:4d:a2:73:4f:82", ip => "130.242.130.20";
-   }
+   dhcp::host { 'kvm-tug-2':		mac => "f0:4d:a2:73:4f:82", ip => "130.242.130.20"; }
+   #dhcp::host { 'kvm-tug-2':		mac => "f0:4d:a2:73:4f:83", ip => "130.242.130.20"; }
 
-   dhcp::host { 'db-tug-2': mac => "24:b6:fd:fe:fa:f0", ip => "130.242.130.21"; }
-   #dhcp::host { 'db-tug-2_eth1': mac => "24:b6:fd:fe:fa:53", ip => "130.242.130.21"; }
+   dhcp::host { 'db-tug-2':		mac => "24:b6:fd:fe:fa:f0", ip => "130.242.130.21"; }
+   #dhcp::host { 'db-tug-2':		mac => "24:b6:fd:fe:fa:53", ip => "130.242.130.21"; }
 
-   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 {
-     'dashboard-tug-2': mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30";
-   }
+   dhcp::host { 'dashboard-tug-2':	mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30"; }
+   #dhcp::host { 'dashboard-tug-2':	mac => "f0:4d:a2:73:4f:0e", ip => "130.242.130.30"; }
 
 
 
    # eduID FRE hosts
 
-   dhcp::host {
-     'kvmidp-fre-2': mac => "18:03:73:41:f3:e8", ip => "130.242.130.68";
-   }
+   dhcp::host { 'kvmidp-fre-2':		mac => "18:03:73:41:f3:e8", ip => "130.242.130.68"; }
 
-   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': mac => "18:03:73:0f:41:3c", ip => "130.242.130.76";
-   }
+   dhcp::host { 'auth-fre-2':		mac => "18:03:73:0f:41:3c", ip => "130.242.130.76"; }
 
-   dhcp::host {
-     'kvm-fre-2': mac => "f0:4d:a2:73:4b:e3", ip => "130.242.130.84";
-   }
+   dhcp::host { 'kvm-fre-2':		mac => "f0:4d:a2:73:4b:e3", ip => "130.242.130.84"; }
 
-   dhcp::host {
-     'db-fre-2': mac => "f0:4d:a2:73:4f:19", ip => "130.242.130.85";
-   }
+   dhcp::host { 'db-fre-2':		mac => "f0:4d:a2:73:4f:19", ip => "130.242.130.85"; }
 
 
    # eduID LLA hosts
 
-   dhcp::host {
-     'db-lla-2': mac => "f0:4d:a2:73:4e:08", ip => "130.242.130.148";
-   }
+   dhcp::host { 'db-lla-2':		mac => "f0:4d:a2:73:4e:08", ip => "130.242.130.148"; }
 
 }