aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-01-07 00:07:44 +0000
committerPascal Terjan <pterjan@mageia.org>2020-01-07 00:08:59 +0000
commit2cf2732d415dc8a368da652bf40bc8aa0f327eff (patch)
tree17c5a21a6b7f573d23461c80ca9c7c0b7d5868dd
parent4a3677ae453e1da8e9ae4c38798e299810b2be54 (diff)
downloadpuppet-2cf2732d415dc8a368da652bf40bc8aa0f327eff.tar
puppet-2cf2732d415dc8a368da652bf40bc8aa0f327eff.tar.gz
puppet-2cf2732d415dc8a368da652bf40bc8aa0f327eff.tar.bz2
puppet-2cf2732d415dc8a368da652bf40bc8aa0f327eff.tar.xz
puppet-2cf2732d415dc8a368da652bf40bc8aa0f327eff.zip
Add aarch64 build nodes on EC2
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp6
-rw-r--r--manifests/nodes/ec2aa1.pp7
-rw-r--r--manifests/nodes/ec2aa2.pp7
-rw-r--r--manifests/nodes_ip.pp6
4 files changed, 25 insertions, 1 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 43df0c64..cb53429b 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -30,7 +30,7 @@ class mga_buildsystem::config {
'x86_64' => [ 'rabbit0', 'ecosse0', 'scwx861', 'rabbit1', 'ecosse1', 'scwx862', 'rabbit2', 'scwx863' ],
'armv5tl' => [ 'armlet3', 'armlet5' ],
'armv7hl' => [ 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ],
- 'aarch64' => [ 'scwaarch641', 'scwaarch643', 'scwaarch645', 'scwaarch642', 'scwaarch644', 'scwaarch646' ],
+ 'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'scwaarch641', 'scwaarch643', 'scwaarch642', 'scwaarch644' ],
},
build_nodes_aliases => {
'ecosse0' => "ecosse.${::domain}",
@@ -44,6 +44,10 @@ class mga_buildsystem::config {
'scwaarch642' => "scwaarch64.${::domain}",
'scwaarch644' => "scwaarch643.${::domain}",
'scwaarch646' => "scwaarch645.${::domain}",
+ 'ec2aa1-a' => "ec2aa1.${::domain}",
+ 'ec2aa1-b' => "ec2aa1.${::domain}",
+ 'ec2aa2-a' => "ec2aa2.${::domain}",
+ 'ec2aa2-b' => "ec2aa2.${::domain}",
},
build_src_node => 'duvel',
}
diff --git a/manifests/nodes/ec2aa1.pp b/manifests/nodes/ec2aa1.pp
new file mode 100644
index 00000000..f000db8a
--- /dev/null
+++ b/manifests/nodes/ec2aa1.pp
@@ -0,0 +1,7 @@
+node ec2aa1 {
+# Location: Amazon (eu-central-1a)
+#
+ include common::default_mageia_server
+ include mga_buildsystem::buildnode
+ timezone::timezone { 'Europe/Paris': }
+}
diff --git a/manifests/nodes/ec2aa2.pp b/manifests/nodes/ec2aa2.pp
new file mode 100644
index 00000000..a4e1e27f
--- /dev/null
+++ b/manifests/nodes/ec2aa2.pp
@@ -0,0 +1,7 @@
+node ec2aa2 {
+# Location: Amazon (eu-central-1b)
+#
+ 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 6fa800b9..6dbee916 100644
--- a/manifests/nodes_ip.pp
+++ b/manifests/nodes_ip.pp
@@ -55,6 +55,12 @@ $nodes_ipaddr = {
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',
+ }
}
# vim: sw=2