From 76ce6bfa5088ddea68ce7e9dfe74f20e285d63ae Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Thu, 28 Sep 2017 12:37:10 +0100 Subject: Try adding a temporary builder now that we have a Scaleway Mageia 6 image --- deployment/mga_buildsystem/manifests/config.pp | 5 +++-- manifests/nodes/scwbuilder.pp | 7 +++++++ manifests/nodes_ip.pp | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 manifests/nodes/scwbuilder.pp diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index ba1cff2c..22d953ce 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' ], - 'x86_64' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1' ], + 'i586' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'scwbuilder' ], + 'x86_64' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'scwbuilder' ], 'armv5tl' => [ 'armorique', 'armagnac', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armlet8', 'armlet9' ], 'armv7hl' => [ 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armorique', 'armagnac', 'armlet8', 'armlet9' ], }, @@ -153,6 +153,7 @@ 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 new file mode 100644 index 00000000..51ff46ac --- /dev/null +++ b/manifests/nodes/scwbuilder.pp @@ -0,0 +1,7 @@ +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 d0751141..a7b673c7 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -63,6 +63,9 @@ $nodes_ipaddr = { friteuse => { ipv4 => '192.168.122.131', } + scwbuilder => { + ipv6 => '2001:bc8:4400:2500::16:a11', + }, } # vim: sw=2 -- cgit v1.2.1