aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/mga_buildsystem/manifests/config.pp
diff options
context:
space:
mode:
Diffstat (limited to 'deployment/mga_buildsystem/manifests/config.pp')
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp10
1 files changed, 4 insertions, 6 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index ec0b0310..6c641bca 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -26,8 +26,8 @@ class mga_buildsystem::config {
class { 'buildsystem::var::scheduler' :
admin_mail => "sysadmin@group.${::domain}",
build_nodes => {
- 'i586' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ],
- 'x86_64' => [ 'rabbit0', 'ecosse0', 'scwx861', 'rabbit1', 'ecosse1', 'scwx862', 'rabbit2', 'scwx863' ],
+ 'i586' => [ 'ecosse0', 'rabbit0', 'ec2x1-a', 'ecosse1', 'rabbit1', 'ec2x1-b', 'rabbit2' ],
+ 'x86_64' => [ 'rabbit0', 'ecosse0', 'ec2x1-a', 'rabbit1', 'ecosse1', 'ec2x1-b', 'rabbit2' ],
'armv7hl' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa3-a', 'ec2aa1-b', 'ec2aa2-b', 'ec2aa3-b' ],
'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa3-a', 'ec2aa1-b', 'ec2aa2-b', 'ec2aa3-b' ],
},
@@ -36,15 +36,14 @@ class mga_buildsystem::config {
'ecosse1' => "ecosse.${::domain}",
'rabbit0' => "rabbit.${::domain}",
'rabbit1' => "rabbit.${::domain}",
- 'scwx861' => "scwx86.${::domain}",
- 'scwx862' => "scwx86.${::domain}",
- 'scwx863' => "scwx86.${::domain}",
'ec2aa1-a' => "ec2aa1.${::domain}",
'ec2aa1-b' => "ec2aa1.${::domain}",
'ec2aa2-a' => "ec2aa2.${::domain}",
'ec2aa2-b' => "ec2aa2.${::domain}",
'ec2aa3-a' => "ec2aa3.${::domain}",
'ec2aa3-b' => "ec2aa3.${::domain}",
+ 'ec2x1-a' => "ec2x1.${::domain}",
+ 'ec2x1-b' => "ec2x1.${::domain}",
},
build_src_node => 'duvel',
}
@@ -166,7 +165,6 @@ class mga_buildsystem::config {
$::nodes_ipaddr[neru][ipv4],
$::nodes_ipaddr[neru][ipv6],
'2001:bc8:4400:2700::2729',
- $::nodes_ipaddr[scwx86][ipv6],
'147.75.83.250',
'2604:1380:2000:f100::1',
'2a05:d014:e9:2c00::/56',