diff options
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 17 | ||||
| l--------- | reep.tid.isoc.org/README | 1 | ||||
| -rw-r--r-- | web.nordu.net/README | 4 |
3 files changed, 6 insertions, 16 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': diff --git a/reep.tid.isoc.org/README b/reep.tid.isoc.org/README deleted file mode 120000 index 59a23c4..0000000 --- a/reep.tid.isoc.org/README +++ /dev/null @@ -1 +0,0 @@ -../README
\ No newline at end of file diff --git a/web.nordu.net/README b/web.nordu.net/README deleted file mode 100644 index 9a73bce..0000000 --- a/web.nordu.net/README +++ /dev/null @@ -1,4 +0,0 @@ - -The system documentation is in the docs directory of the multiverse repository. - -- type make upgrade to run ubuntu/debian upgrade on all boxes |