diff options
| author | Johan Lundberg <lundberg@nordu.net> | 2015-09-23 13:37:31 +0200 |
|---|---|---|
| committer | Johan Lundberg <lundberg@nordu.net> | 2015-09-23 13:37:31 +0200 |
| commit | ea3a2dbbcde396b76d7340920e79a9551d570d04 (patch) | |
| tree | 3b2c009575a4fd44a7c7df58bdcc20cade11fc41 /global/overlay/etc/puppet | |
| parent | 3e4a591b42c62626129dae57cd97afe393c1c95d (diff) | |
| parent | a0c94c7a92628a91c8e43442de41237242b6649f (diff) | |
Merge branch 'master' of git.nordu.net:nunoc-opssunet-ops-2015-09-23-v10
Diffstat (limited to 'global/overlay/etc/puppet')
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index f3e903d..a205fd9 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -82,9 +82,10 @@ node 'sto-tug-kvm1.swamid.se' { memory => '2048', } - sunet::dhcp_kvm { 'mdx1.swamid.se': + sunet::cloudimage { 'mdx1.swamid.se': mac => '52:54:00:fe:bc:09', - repo => 'git://git.nordu.net/sunet-ops.git', + dhcp => true, + repo => 'git://git.nordu.net/nunoc-ops.git', tagpattern => 'sunet-ops', cpus => '1', memory => '2048', @@ -100,13 +101,11 @@ node 'sto-tug-kvm1.swamid.se' { } node 'sto-fre-kvm1.swamid.se' { - package {'python-vm-builder': - ensure => 'installed', - } -> - sunet::dhcp_kvm { 'mdx2.swamid.se': + sunet::cloudimage { 'mdx2.swamid.se': mac => '52:54:00:30:be:dd', - repo => 'git://git.nordu.net/sunet-ops.git', + dhcp => true, + repo => 'git://git.nordu.net/nunoc-ops.git', tagpattern => 'sunet-ops', cpus => '1', memory => '2048', @@ -114,10 +113,6 @@ node 'sto-fre-kvm1.swamid.se' { } -node 'reep.tid.isoc.org' { - -} - node 'datasets.sunet.se' { class {'sunet::dockerhost': } -> file {'/opt/lobo2-redis-data': |