diff options
| author | Olivier Blin <dev@blino.org> | 2016-01-31 13:32:22 +0100 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2016-01-31 13:32:22 +0100 |
| commit | 47de84951e268821bceae36f5c96ab73aacf219c (patch) | |
| tree | 7071da0ca00ef373e907af56b576188fc7b50565 | |
| parent | 6ba05c78a5ced94d3d4f46fe35ab370ef8a2f154 (diff) | |
| download | puppet-47de84951e268821bceae36f5c96ab73aacf219c.tar puppet-47de84951e268821bceae36f5c96ab73aacf219c.tar.gz puppet-47de84951e268821bceae36f5c96ab73aacf219c.tar.bz2 puppet-47de84951e268821bceae36f5c96ab73aacf219c.tar.xz puppet-47de84951e268821bceae36f5c96ab73aacf219c.zip | |
add duvel node
This is a new server that will be used to replace valstar as main node.
It is hosted in the IELO datacenter (Marseille).
Name chosen by Dan Fandrich at FOSDEM 2016
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 2 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 3 | ||||
| -rw-r--r-- | manifests/nodes/duvel.pp | 5 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 4 | ||||
| -rw-r--r-- | modules/xymon/templates/bb-hosts | 1 |
5 files changed, 13 insertions, 2 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index e653b7e9..18efd2c9 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. ( - 2015120300 ; Serial + 2016013100 ; Serial 21600 ; Refresh 3600 ; Retry 2419200 ; Expire diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index a681a715..010bb1ca 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -145,6 +145,8 @@ class mga_buildsystem::config { $repo_allow_from = [ $::nodes_ipaddr[valstar][ipv6], $::nodes_ipaddr[valstar][ipv4], + $::nodes_ipaddr[duvel][ipv6], + $::nodes_ipaddr[duvel][ipv4], $::nodes_ipaddr[ecosse][ipv6], $::nodes_ipaddr[ecosse][ipv4], $::nodes_ipaddr[jonund][ipv6], @@ -153,7 +155,6 @@ class mga_buildsystem::config { '10.42.0', $::nodes_ipaddr[rabbit][ipv4], $::nodes_ipaddr[rabbit][ipv6], - '212.85.158.158', $::nodes_ipaddr[sucuk][ipv4], $::nodes_ipaddr[sucuk][ipv6], '85.134.55.73', diff --git a/manifests/nodes/duvel.pp b/manifests/nodes/duvel.pp new file mode 100644 index 00000000..9928cbd6 --- /dev/null +++ b/manifests/nodes/duvel.pp @@ -0,0 +1,5 @@ +node duvel { +# Location: IELO datacenter (marseille) + include common::default_mageia_server + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 28b5c5d9..2c818c65 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -17,6 +17,10 @@ $nodes_ipaddr = { ipv4 => '212.85.158.147', ipv6 => '2a02:2178:2:7::3', }, + duvel => { + ipv4 => '212.85.158.158, + ipv6 => '2a02:2178:2:7:eef4:bbff:fec1:cea4', + }, ecosse => { ipv4 => '212.85.158.148', ipv6 => '2a02:2178:2:7::4', diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index 809e1f84..b6f54034 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -34,6 +34,7 @@ page servers Servers group-compress Marseille 212.85.158.146 alamut.<%= domain %> # testip bbd dns smtp ssh CLIENT:xymon.<%= domain %> http://xymon.<%= domain %> 212.85.158.147 valstar.<%= domain %> # testip ssh rsync svn git ldapssl ldap +212.85.158.158 duvel.<%= domain %> # testip ssh 212.85.158.148 ecosse.<%= domain %> # testip ssh #212.85.158.149 jonund.<%= domain %> # testip ssh 212.85.158.150 fiona.<%= domain %> # testip ssh |