aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-01-12 21:41:31 +0000
committerPascal Terjan <pterjan@mageia.org>2020-01-12 21:41:45 +0000
commit4b2026b6c8129dc002c1eaf7b4b490c35b8ea200 (patch)
tree841894022f7f15377a03588b290084b0b56a6ae2 /manifests
parentc4228a23ce814460e41d8b820b556e007241e24d (diff)
downloadpuppet-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
Diffstat (limited to 'manifests')
-rw-r--r--manifests/nodes/scwaarch643.pp7
-rw-r--r--manifests/nodes/scwaarch645.pp7
-rw-r--r--manifests/nodes_ip.pp11
3 files changed, 4 insertions, 21 deletions
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