summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-23 13:32:31 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-23 13:32:31 +0200
commitb5d22600675ae5270d91fb21ac3acf8ab49b33f1 (patch)
tree8afb66b0de59010256430c027d0c7fad975e32df /global
parent83f4fb1bd3304b0120410bb8ba8204ed2ccd82ff (diff)
respin mdx1 & mdx2
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp19
1 files changed, 6 insertions, 13 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index f3e903d..4c8af99 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -82,9 +82,9 @@ node 'sto-tug-kvm1.swamid.se' {
memory => '2048',
}
- sunet::dhcp_kvm { 'mdx1.swamid.se':
- mac => '52:54:00:fe:bc:09',
- repo => 'git://git.nordu.net/sunet-ops.git',
+ sunet::cloudimage { 'mdx1.swamid.se':
+ dhcp => true,
+ repo => 'git://git.nordu.net/nunoc-ops.git',
tagpattern => 'sunet-ops',
cpus => '1',
memory => '2048',
@@ -100,13 +100,10 @@ node 'sto-tug-kvm1.swamid.se' {
}
node 'sto-fre-kvm1.swamid.se' {
- package {'python-vm-builder':
- ensure => 'installed',
- } ->
- sunet::dhcp_kvm { 'mdx2.swamid.se':
- mac => '52:54:00:30:be:dd',
- repo => 'git://git.nordu.net/sunet-ops.git',
+ sunet::cloudimage { 'mdx2.swamid.se':
+ dhcp => true,
+ repo => 'git://git.nordu.net/nunoc-ops.git',
tagpattern => 'sunet-ops',
cpus => '1',
memory => '2048',
@@ -114,10 +111,6 @@ node 'sto-fre-kvm1.swamid.se' {
}
-node 'reep.tid.isoc.org' {
-
-}
-
node 'datasets.sunet.se' {
class {'sunet::dockerhost': } ->
file {'/opt/lobo2-redis-data':