summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Thulin <fredrik@thulin.net>2013-11-08 12:11:14 +0100
committerFredrik Thulin <fredrik@thulin.net>2013-11-08 12:11:14 +0100
commitd8f96b7e6e150940eb30a0e90bf0be7cafe56e6b (patch)
tree5c3056ba62522d0c60f7ed19548fab5bfe64988f
parent539f679a0592336cefc8d3534f818b02d5ac8f20 (diff)
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp16
1 files changed, 8 insertions, 8 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 2a85a4d..e735978 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -125,18 +125,18 @@ node 'sto-tug-kvm1.swamid.se' {
# 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:52", ip => "130.242.130.4"; }
+ 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-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_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': 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 { '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:53", ip => "130.242.130.21", hostname => 'db-tug-2'; }
@@ -149,8 +149,8 @@ node 'sto-tug-kvm1.swamid.se' {
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:0e", ip => "130.242.130.30"; }
+ 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'; }