summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-05-11 22:18:06 +0200
committerLeif Johansson <leifj@sunet.se>2015-05-11 22:18:06 +0200
commit233b0cb53eee4f12549b409f3ffba349faa3552b (patch)
tree1c7f9af1534c72dde98f81964136f90223f1ffe0
parentdd639432bc6318f8a102f722813194348218bebc (diff)
fix address hellct-ops-2015-05-11-v10
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp42
1 files changed, 21 insertions, 21 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 159ea22..9b7b03c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -79,14 +79,14 @@ class sshkeys {
}
node 'f1.ct.nordu.net' {
- include sunet::kvmtools
- sunet::cloudimage { 'ct-frontend-1.urd.appendto.org':
+ class { 'sunet::kvmtools': } ->
+ sunet::cloudimage { 'frontend-1.urd.appendto.org':
dhcp => false,
- repo => 'git://git.nordu.net/ct-ops.git',
- tagpattern => 'ct-ops',
+ repo => 'git://git.nordu.net/ops.git',
+ tagpattern => 'ops',
cpus => '8',
memory => '8196',
- ip => '130.242.125.94',
+ ip => '130.242.125.96',
netmask => '255.255.255.192',
gateway => '130.242.125.65',
resolver => '130.242.80.14 130.242.80.99'
@@ -94,22 +94,22 @@ node 'f1.ct.nordu.net' {
}
node 'm1.ct.nordu.net' {
- include sunet::kvmtools
- sunet::cloudimage { 'ct-frontend-2.urd.appendto.org':
+ class { 'sunet::kvmtools': } ->
+ sunet::cloudimage { 'frontend-2.urd.appendto.org':
dhcp => false,
- repo => 'git://git.nordu.net/ct-ops.git',
- tagpattern => 'ct-ops',
+ repo => 'git://git.nordu.net/ops.git',
+ tagpattern => 'ops',
cpus => '8',
memory => '16384',
- ip => '130.242.125.136',
+ ip => '130.242.125.137',
netmask => '255.255.255.192',
gateway => '130.242.125.65',
resolver => '130.242.80.14 130.242.80.99'
}
- sunet::cloudimage { 'ct-sign-2.urd.appendto.org':
+ sunet::cloudimage { 'sign-2.urd.appendto.org':
dhcp => false,
- repo => 'git://git.nordu.net/ct-ops.git',
- tagpattern => 'ct-ops',
+ repo => 'git://git.nordu.net/ops.git',
+ tagpattern => 'ops',
cpus => '2',
memory => '4096',
ip => '193.10.80.177',
@@ -120,22 +120,22 @@ node 'm1.ct.nordu.net' {
}
node 'm0.ct.nordu.net' {
- include sunet::kvmtools
- sunet::cloudimage { 'ct-merge-1.urd.appendto.org':
+ class { 'sunet::kvmtools': } ->
+ sunet::cloudimage { 'merge-1.urd.appendto.org':
dhcp => false,
- repo => 'git://git.nordu.net/ct-ops.git',
- tagpattern => 'ct-ops',
+ repo => 'git://git.nordu.net/ops.git',
+ tagpattern => 'ops',
cpus => '8',
memory => '16384',
- ip => '130.242.125.93',
+ ip => '130.242.125.95',
netmask => '255.255.255.192',
gateway => '130.242.125.65',
resolver => '130.242.80.14 130.242.80.99'
}
- sunet::cloudimage { 'ct-sign-1.urd.appendto.org':
+ sunet::cloudimage { 'sign-1.urd.appendto.org':
dhcp => false,
- repo => 'git://git.nordu.net/ct-ops.git',
- tagpattern => 'ct-ops',
+ repo => 'git://git.nordu.net/ops.git',
+ tagpattern => 'ops',
cpus => '2',
memory => '4096',
ip => '193.10.80.145',