From b5d22600675ae5270d91fb21ac3acf8ab49b33f1 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 23 Sep 2015 13:32:31 +0200 Subject: respin mdx1 & mdx2 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'global/overlay/etc/puppet') 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': -- cgit v1.1 From a0c94c7a92628a91c8e43442de41237242b6649f Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 23 Sep 2015 13:35:31 +0200 Subject: mac for mdx* --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'global/overlay/etc/puppet') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 4c8af99..a205fd9 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -83,6 +83,7 @@ node 'sto-tug-kvm1.swamid.se' { } sunet::cloudimage { 'mdx1.swamid.se': + mac => '52:54:00:fe:bc:09', dhcp => true, repo => 'git://git.nordu.net/nunoc-ops.git', tagpattern => 'sunet-ops', @@ -102,6 +103,7 @@ node 'sto-tug-kvm1.swamid.se' { node 'sto-fre-kvm1.swamid.se' { sunet::cloudimage { 'mdx2.swamid.se': + mac => '52:54:00:30:be:dd', dhcp => true, repo => 'git://git.nordu.net/nunoc-ops.git', tagpattern => 'sunet-ops', -- cgit v1.1