From 4b2026b6c8129dc002c1eaf7b4b490c35b8ea200 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Sun, 12 Jan 2020 21:41:31 +0000
Subject: Switch almost all arm builds to Amazon

This includes dropping armv5tl
---
 manifests/nodes/scwaarch643.pp |  7 -------
 manifests/nodes/scwaarch645.pp |  7 -------
 manifests/nodes_ip.pp          | 11 ++++-------
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 manifests/nodes/scwaarch643.pp
 delete mode 100644 manifests/nodes/scwaarch645.pp

(limited to 'manifests')

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
-- 
cgit v1.2.1