diff options
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 7 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 10 | ||||
| -rw-r--r-- | manifests/nodes/scwx86.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 6 |
4 files changed, 10 insertions, 20 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 0ec552cd..50d81eb1 100644 --- a/deployment/dns/templates/mageia.org.zone +++ b/deployment/dns/templates/mageia.org.zone @@ -7,7 +7,7 @@ ; $Id$ $TTL 30m @ IN SOA ns0.mageia.org. root.mageia.org. ( - 2020012701 ; Serial + 2020020901 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -120,14 +120,13 @@ ecosse1 IN CNAME ecosse rabbit0 IN CNAME rabbit rabbit1 IN CNAME rabbit rabbit2 IN CNAME rabbit -scwx861 IN CNAME scwx86 -scwx862 IN CNAME scwx86 -scwx863 IN CNAME scwx86 ec2aa1-a IN CNAME ec2aa1 ec2aa1-b IN CNAME ec2aa1 ec2aa2-a IN CNAME ec2aa2 ec2aa2-b IN CNAME ec2aa2 ec2aa3-a IN CNAME ec2aa3 ec2aa3-b IN CNAME ec2aa3 +ec2x1-a IN CNAME ec2x1 +ec2x1-b IN CNAME ec2x1 <%# vim: set filetype=bindzone : -%> 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', diff --git a/manifests/nodes/scwx86.pp b/manifests/nodes/scwx86.pp deleted file mode 100644 index 2944d41d..00000000 --- a/manifests/nodes/scwx86.pp +++ /dev/null @@ -1,7 +0,0 @@ -node scwx86 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 93f0d116..76c1b443 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -34,9 +34,6 @@ $nodes_ipaddr = { friteuse => { ipv4 => '192.168.122.131', }, - scwx86 => { - ipv6 => '2001:bc8:4400:2000::5e29', - }, ec2aa1 => { ipv6 => '2a05:d014:e9:2c02:98ca:ec83:c601:371a', }, @@ -49,6 +46,9 @@ $nodes_ipaddr = { ec2aaauto => { ipv6 => '2a05:d014:e9:2c03:c80d:e2d9:658d:4c28', }, + ec2x1 => { + ipv6 => '2a05:d014:e9:2c03:ce2e:f80a:bc2b:da0d', + }, } # vim: sw=2 |