aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <dev@blino.org>2015-10-29 00:49:18 +0100
committerOlivier Blin <dev@blino.org>2015-10-29 00:52:12 +0100
commitafcd7188417869d5bbb42001b0a8a93a3cd59880 (patch)
tree55bf8da2fdfb518d139a741a72a81380f3e222ac
parent234ca41c7a310a697b2f3c1cc2d0776a3e56764a (diff)
downloadpuppet-afcd7188417869d5bbb42001b0a8a93a3cd59880.tar
puppet-afcd7188417869d5bbb42001b0a8a93a3cd59880.tar.gz
puppet-afcd7188417869d5bbb42001b0a8a93a3cd59880.tar.bz2
puppet-afcd7188417869d5bbb42001b0a8a93a3cd59880.tar.xz
puppet-afcd7188417869d5bbb42001b0a8a93a3cd59880.zip
add armorique node
This a new ARM server for the buildsystem, managed by Scaleway and hosted in an Iliad/Online datacenter. Name approved by neoclust: https://ml.mageia.org/l/arc/sysadmin-discuss/2015-10/msg00052.html
-rw-r--r--deployment/dns/templates/mageia.org.zone2
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp1
-rw-r--r--manifests/nodes/armorique.pp5
-rw-r--r--manifests/nodes_ip.pp3
4 files changed, 10 insertions, 1 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index 39c1b13d..a9e6762f 100644
--- a/deployment/dns/templates/mageia.org.zone
+++ b/deployment/dns/templates/mageia.org.zone
@@ -7,7 +7,7 @@
; $Id$
$TTL 30m
@ IN SOA ns0.mageia.org. root.mageia.org. (
- 2015100700 ; Serial
+ 2015102900 ; Serial
21600 ; Refresh
3600 ; Retry
2419200 ; Expire
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 5127e8ba..6a6d89a7 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -148,6 +148,7 @@ class mga_buildsystem::config {
$::nodes_ipaddr[sucuk][ipv4],
$::nodes_ipaddr[sucuk][ipv6],
'85.134.55.73',
+ $::nodes_ipaddr[armorique][ipv4],
]
# the list of checks, actions, posts for cauldron in youri-upload
diff --git a/manifests/nodes/armorique.pp b/manifests/nodes/armorique.pp
new file mode 100644
index 00000000..811d84b1
--- /dev/null
+++ b/manifests/nodes/armorique.pp
@@ -0,0 +1,5 @@
+node armorique {
+# Location: Scaleway (Iliad/Online datacenter)
+ include common::default_mageia_server
+ timezone::timezone { 'Europe/Paris': }
+}
diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp
index f68d49fc..780afe15 100644
--- a/manifests/nodes_ip.pp
+++ b/manifests/nodes_ip.pp
@@ -43,6 +43,9 @@ $nodes_ipaddr = {
arm2 => {
ipv4 => '10.42.0.52',
},
+ armorique => {
+ ipv4 => '212.47.242.112',
+ },
friteuse => {
ipv4 => '192.168.122.131',
}