diff options
| author | Bruno Cornec <bruno@victoria.frmug.org> | 2024-12-06 00:35:12 +0100 |
|---|---|---|
| committer | Bruno Cornec <bruno@victoria.frmug.org> | 2025-10-19 01:19:27 +0200 |
| commit | 76326195b0afe3cbba57c85455c80da62b8cbb3c (patch) | |
| tree | 1a6865711cec2d16d742fee18aebe0d4a3e80e28 | |
| parent | 8e64442ba068be982905aa7c65783770ca3039cd (diff) | |
| download | puppet-user/bcornec/infra.tar puppet-user/bcornec/infra.tar.gz puppet-user/bcornec/infra.tar.bz2 puppet-user/bcornec/infra.tar.xz puppet-user/bcornec/infra.zip | |
Add 2 new aarch64 build nodes named lavand and majaxuser/bcornec/infra
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 2 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 6 | ||||
| -rw-r--r-- | manifests/nodes/lavand.pp | 8 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 6 | ||||
| -rw-r--r-- | modules/xymon/templates/bb-hosts | 4 |
5 files changed, 24 insertions, 2 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index a04ca19b..97a1ad1a 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. ( - 2025100701 ; Serial + 2025101501 ; Serial 7200 ; Refresh 3600 ; Retry 3600000 ; Expire diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index c0c62cc4..41416583 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -30,7 +30,7 @@ class mga_buildsystem::config { 'i686' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'rabbit2' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'rabbit1', 'ecosse1', 'rabbit2' ], 'armv7hl' => [ 'ncaa1-a', 'ncaa1-b', 'ncaa1-c', 'ociaa1-a', 'ociaa1-b'], - 'aarch64' => [ 'ncaa1-a', 'ncaa1-b', 'ncaa1-c', 'ociaa1-a', 'ociaa1-b'], + 'aarch64' => [ 'ncaa1-a', 'ncaa1-b', 'ncaa1-c', 'ociaa1-a', 'ociaa1-b','lavand', 'majax' ], }, build_nodes_aliases => { 'ecosse0' => "ecosse.${::domain}", @@ -41,6 +41,8 @@ class mga_buildsystem::config { 'ociaa1-a' => "ociaa1.${::domain}", 'ociaa1-b' => "ociaa1.${::domain}", 'ociaa1-c' => "ociaa1.${::domain}", + 'lavand' => "lavand.${::domain}", + 'majax' => "majax.${::domain}", }, build_src_node => 'duvel', } @@ -152,6 +154,8 @@ class mga_buildsystem::config { $::nodes_ipaddr[duvel][ipv4], $::nodes_ipaddr[ecosse][ipv6], $::nodes_ipaddr[ecosse][ipv4], + $::nodes_ipaddr[lavand][ipv4], + $::nodes_ipaddr[majax][ipv4], $::nodes_ipaddr[fiona][ipv6], $::nodes_ipaddr[fiona][ipv4], '10.42.0', diff --git a/manifests/nodes/lavand.pp b/manifests/nodes/lavand.pp new file mode 100644 index 00000000..f29bbeb2 --- /dev/null +++ b/manifests/nodes/lavand.pp @@ -0,0 +1,8 @@ +node lavand { +# See https://fr.wikipedia.org/wiki/Ren%C3%A9_Lavand he had one ARM ;-) +# Location: Hetzner +# + 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 38553b61..0e723db8 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -34,6 +34,12 @@ $nodes_ipaddr = { friteuse => { ipv4 => '192.168.122.131', }, + lavand => { + ipv4 => '49.13.82.246', + }, + majax => { + ipv4 => '128.140.83.19', + }, ec2aa1 => { ipv6 => '2a05:d014:e9:2c02:98ca:ec83:c601:371a', }, diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index 140932b5..2e1220c6 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -43,6 +43,10 @@ group-compress Marseille group-compress VM Sucuk 192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=<%= @nodes_ipaddr['friteuse']['ipv4'] %>/ %>/ +group-compress Hetzner +49.13.82.246 lavand.<%= domain %> # testip +128.140.83.19 majax.<%= domain %> # testip + group-compress Scaleway 163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp 163.172.201.211 madb.mageia.org # testip |