diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2020-01-12 21:41:31 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2020-01-12 21:41:45 +0000 |
| commit | 4b2026b6c8129dc002c1eaf7b4b490c35b8ea200 (patch) | |
| tree | 841894022f7f15377a03588b290084b0b56a6ae2 | |
| parent | c4228a23ce814460e41d8b820b556e007241e24d (diff) | |
| download | puppet-4b2026b6c8129dc002c1eaf7b4b490c35b8ea200.tar puppet-4b2026b6c8129dc002c1eaf7b4b490c35b8ea200.tar.gz puppet-4b2026b6c8129dc002c1eaf7b4b490c35b8ea200.tar.bz2 puppet-4b2026b6c8129dc002c1eaf7b4b490c35b8ea200.tar.xz puppet-4b2026b6c8129dc002c1eaf7b4b490c35b8ea200.zip | |
Switch almost all arm builds to Amazon
This includes dropping armv5tl
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 4 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/scwaarch643.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/scwaarch645.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 11 |
5 files changed, 11 insertions, 25 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 11c46d82..8059114b 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. ( - 2020010702 ; Serial + 2020011201 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -131,5 +131,7 @@ 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 <%# vim: set filetype=bindzone : -%> diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 1a9af791..c0b5da2d 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -28,9 +28,8 @@ class mga_buildsystem::config { build_nodes => { 'i586' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'scwx861', 'rabbit1', 'ecosse1', 'scwx862', 'rabbit2', 'scwx863' ], - 'armv5tl' => [ 'armlet1', 'armlet2' ], - 'armv7hl' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'armlet1', 'armlet2' ], - 'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'scwaarch641', 'scwaarch643', 'scwaarch642', 'scwaarch644' ], + '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', scwaarch641', 'scwaarch642' ], }, build_nodes_aliases => { 'ecosse0' => "ecosse.${::domain}", @@ -48,6 +47,8 @@ class mga_buildsystem::config { 'ec2aa1-b' => "ec2aa1.${::domain}", 'ec2aa2-a' => "ec2aa2.${::domain}", 'ec2aa2-b' => "ec2aa2.${::domain}", + 'ec2aa3-a' => "ec2aa3.${::domain}", + 'ec2aa3-b' => "ec2aa3.${::domain}", }, build_src_node => 'duvel', } diff --git a/manifests/nodes/scwaarch643.pp b/manifests/nodes/scwaarch643.pp deleted file mode 100644 index 1887ce36..00000000 --- a/manifests/nodes/scwaarch643.pp +++ /dev/null @@ -1,7 +0,0 @@ -node scwaarch643 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/scwaarch645.pp b/manifests/nodes/scwaarch645.pp deleted file mode 100644 index e600bb23..00000000 --- a/manifests/nodes/scwaarch645.pp +++ /dev/null @@ -1,7 +0,0 @@ -node scwaarch645 { -# 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 20b6ca8c..fd033251 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -40,18 +40,15 @@ $nodes_ipaddr = { scwaarch64 => { ipv6 => '2001:bc8:47c0:60d::1', }, - scwaarch643 => { - ipv6 => '2001:bc8:47c0:1320::1', - }, - scwaarch645 => { - ipv6 => '2001:bc8:47c0:14a::1', - }, ec2aa1 => { ipv6 => '2a05:d014:e9:2c02:98ca:ec83:c601:371a', }, ec2aa2 => { ipv6 => '2a05:d014:e9:2c03:b7e1:fda8:eab9:6692', - } + }, + ec2aa3 => { + ipv6 => '2a05:d014:e9:2c03:17a8:1204:6df6:662c', + }, } # vim: sw=2 |