diff options
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 5 | ||||
| -rw-r--r-- | manifests/nodes/armorique.pp | 8 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 3 | ||||
| -rw-r--r-- | modules/xymon/templates/bb-hosts | 1 |
4 files changed, 2 insertions, 15 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 37376d3b..c6b48205 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -28,8 +28,8 @@ class mga_buildsystem::config { build_nodes => { 'i586' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'scwx861', 'rabbit1', 'ecosse1', 'scwx862', 'rabbit2', 'scwx863' ], - 'armv5tl' => [ 'armorique', 'armlet3', 'armlet5' ], - 'armv7hl' => [ 'armorique', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ], + 'armv5tl' => [ 'armlet3', 'armlet5' ], + 'armv7hl' => [ 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ], 'aarch64' => [ 'scwaarch641', 'scwaarch643', 'scwaarch645', 'scwaarch642', 'scwaarch644', 'scwaarch646' ], }, build_nodes_aliases => { @@ -162,7 +162,6 @@ class mga_buildsystem::config { $::nodes_ipaddr[sucuk][ipv4], $::nodes_ipaddr[sucuk][ipv6], '85.134.55.73', - $::nodes_ipaddr[armorique][ipv4], $::nodes_ipaddr[neru][ipv4], $::nodes_ipaddr[neru][ipv6], '2001:bc8:4400:2700::2729', diff --git a/manifests/nodes/armorique.pp b/manifests/nodes/armorique.pp deleted file mode 100644 index 0a50f9b6..00000000 --- a/manifests/nodes/armorique.pp +++ /dev/null @@ -1,8 +0,0 @@ -node armorique { -# Location: Scaleway (Iliad/Online datacenter) - include common::default_mageia_server - timezone::timezone { 'Europe/Paris': } - serial_console::serial_console { 'ttyS0': } - - include mga_buildsystem::buildnode -} diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 2d2260ab..e9bfbf3d 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -25,9 +25,6 @@ $nodes_ipaddr = { ipv4 => '212.85.158.153', ipv6 => '2a02:2178:2:7::9', }, - armorique => { - ipv4 => '212.47.242.112', - }, armlet1 => { ipv4 => '163.172.148.228', }, diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index 4e245c30..de5ffb3d 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -42,5 +42,4 @@ group-compress VM Sucuk 192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=192.168.122.131/ https://forums.<%= domain %>=192.168.122.131/ group-compress Scaleway -212.47.242.112 armorique.<%= domain %> # testip ssh 163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp |