summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp27
1 files changed, 14 insertions, 13 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 9f9f859..61016c9 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -44,20 +44,18 @@ node default {
node 'sto-tug-kvm1.swamid.se' {
-
- class { 'dhcp':
- dnsdomain => [ 'eduid.se','sunet.se' ],
- nameservers => ['130.242.80.14','130.242.80.99'],
- ntpservers => ['ntp1.nordu.net','ntp2.nordu.net','Time1.Stupi.SE'],
- interfaces => ['eth0'],
- #pxeserver => '130.242.125.5',
- #pxefilename => 'pxelinux.0',
- default_lease_time => '86400',
- max_lease_time => '172800',
+
+ package {'python-vm-builder':
+ ensure => 'installed',
+ } ->
+
+ cosmos::dhcp_kvm { 'registry.swamid.se':
+ mac => '52:54:00:52:53:0b',
+ repo => 'git://git.nordu.net/sunet-ops.git',
+ tagpattern => 'sunet-ops',
+ cpus => '1',
+ memory => '2048',
}
-
- class { 'sunet-dhcp-hosts': }
-
}
node 'sto-tug-kvm-lab1.swamid.se' {
@@ -264,6 +262,9 @@ class sunet-dhcp-hosts {
dhcp::host { 'samltest': mac => "52:54:00:3a:0a:e4", ip => "130.242.125.80" }
dhcp::host { 'dane.lab': mac => "52:54:00:8d:88:5f", ip => "130.242.125.81" }
dhcp::host { 'meta.swamid': mac => "52:54:00:1c:72:1a", ip => "130.242.125.82" }
+
+ # SWAMID production
+ dhcp::host { 'registry.swamid': mac => "52:54:00:52:53:0b", ip => "130.242.125.90" }
}
class sunet {