From f0c1450fe450c41673d2414b4d5d096006c250d3 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Thu, 28 Sep 2017 17:12:47 +0100
Subject: Remove scwbuilder

It seems to work so we can add it when needed but no point paying
for it currently.
---
 deployment/mga_buildsystem/manifests/config.pp | 5 ++---
 manifests/nodes/scwbuilder.pp                  | 7 -------
 manifests/nodes_ip.pp                          | 5 +----
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 manifests/nodes/scwbuilder.pp

diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 22d953ce..ba1cff2c 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -25,8 +25,8 @@ class mga_buildsystem::config {
     class { 'buildsystem::var::scheduler' :
         admin_mail          => "sysadmin@group.${::domain}",
         build_nodes         => {
-            'i586'   => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'scwbuilder' ],
-            'x86_64' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'scwbuilder' ],
+            'i586'   => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1' ],
+            'x86_64' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1' ],
             'armv5tl' => [ 'armorique', 'armagnac', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armlet8', 'armlet9' ],
             'armv7hl' => [ 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armorique', 'armagnac', 'armlet8', 'armlet9' ],
         },
@@ -153,7 +153,6 @@ class mga_buildsystem::config {
         $::nodes_ipaddr[jonund][ipv4],
         $::nodes_ipaddr[fiona][ipv6],
         $::nodes_ipaddr[fiona][ipv4],
-        $::nodes_ipaddr[scwbuilder][ipv6],
         '10.42.0',
         $::nodes_ipaddr[rabbit][ipv4],
         $::nodes_ipaddr[rabbit][ipv6],
diff --git a/manifests/nodes/scwbuilder.pp b/manifests/nodes/scwbuilder.pp
deleted file mode 100644
index 51ff46ac..00000000
--- a/manifests/nodes/scwbuilder.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-node scwbuilder {
-# Location: Scaleway (paris)
-#
-    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 5efe1c98..d0751141 100644
--- a/manifests/nodes_ip.pp
+++ b/manifests/nodes_ip.pp
@@ -62,10 +62,7 @@ $nodes_ipaddr = {
   },
   friteuse => {
     ipv4 => '192.168.122.131',
-  },
-  scwbuilder => {
-    ipv6 => '2001:bc8:4400:2500::16:a11',
-  },
+  }
 }
 
 # vim: sw=2
-- 
cgit v1.2.1