summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Thulin <fredrik@thulin.net>2014-05-26 12:05:55 +0200
committerFredrik Thulin <fredrik@thulin.net>2014-05-26 12:05:55 +0200
commitb4b1247f99d5daf07b2a8dca45c8dcac63e8ba55 (patch)
tree352b7c195471a14c7f7c3c328c42f475dda86a28
parent9b27b9f2542d8e065e194736d008aa2cdb1c4cfc (diff)
add VM backup-tug-3.eduid.se on cdr1.sunet.sesunet-ops-2014-05-26-v02
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp27
1 files changed, 24 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 63462a7..85b80bc 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -44,11 +44,11 @@ node default {
node 'sto-tug-kvm1.swamid.se' {
-
+
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',
@@ -316,6 +316,9 @@ class sunet-dhcp-hosts {
dhcp::host { 'meta.swamid': mac => "52:54:00:1c:72:1a", ip => "130.242.125.82" }
dhcp::host { 'md-master.reep': mac => "52:54:00:39:8d:ac", ip => "130.242.125.83" }
+ # SUNET TUG eduID hosts (KVM host cdr1.sunet.se)
+ dhcp::host { 'backup-tug-3': mac => "52:54:00:f2:7d:54", ip => "130.242.125.84" }
+
# SWAMID production
dhcp::host { 'registry.swamid': mac => "52:54:00:52:53:0b", ip => "130.242.125.90" }
}
@@ -468,6 +471,24 @@ node 'wp.sunet.se' {
}
}
+node 'cdr1.sunet.se' {
+
+ package {'python-vm-builder':
+ ensure => 'installed',
+ } ->
+
+ cosmos::dhcp_kvm { 'backup-tug-3.eduid.se':
+ mac => '52:54:00:f2:7d:54',
+ repo => 'git://git.nordu.net/sunet-ops.git',
+ tagpattern => 'sunet-ops',
+ cpus => '1',
+ memory => '512',
+ suite => 'trusty',
+ extras => '--addpkg linux-image-generic --tmpfs -',
+ }
+
+}
+
class sunet-cdr {
class { 'dhcp':