diff options
| author | Leif Johansson <leifj@sunet.se> | 2014-04-11 17:19:47 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2014-04-11 17:19:47 +0200 |
| commit | 3321a42d75649c5792e04072f7f6c7c4f1658196 (patch) | |
| tree | 3102ea169da8b32774c47627b977a2fe4feca2ff | |
| parent | 4dad06bf09358ba0f86145a5582ca3c5efdb7883 (diff) | |
swamid production setupsunet-ops-2014-04-11-v01
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 27 |
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 { |