diff options
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 3 | ||||
| -rw-r--r-- | manifests/nodes/armagnac.pp | 8 | ||||
| -rw-r--r-- | manifests/nodes/armlet1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet2.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet4.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet6.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet7.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet9.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 21 | ||||
| -rw-r--r-- | modules/xymon/templates/bb-hosts | 1 |
10 files changed, 1 insertions, 74 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index ea015ed5..74fc1a73 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -28,7 +28,7 @@ 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', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armlet8', 'armlet9' ], + 'armv5tl' => [ 'armorique', 'armlet3', 'armlet5', 'armlet8' ], 'armv7hl' => [ 'armlet10', 'armlet11', 'armlet3', 'armlet8', 'armlet12' ], 'aarch64' => [ 'scwaarch641', 'scwaarch643', 'scwaarch645', 'scwaarch642', 'scwaarch644', 'scwaarch646' ], }, @@ -163,7 +163,6 @@ class mga_buildsystem::config { $::nodes_ipaddr[sucuk][ipv6], '85.134.55.73', $::nodes_ipaddr[armorique][ipv4], - $::nodes_ipaddr[armagnac][ipv4], $::nodes_ipaddr[neru][ipv4], $::nodes_ipaddr[neru][ipv6], '2001:bc8:4400:2700::2729', diff --git a/manifests/nodes/armagnac.pp b/manifests/nodes/armagnac.pp deleted file mode 100644 index 27fa26fc..00000000 --- a/manifests/nodes/armagnac.pp +++ /dev/null @@ -1,8 +0,0 @@ -node armagnac { -# 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/armlet1.pp b/manifests/nodes/armlet1.pp deleted file mode 100644 index 0d731f08..00000000 --- a/manifests/nodes/armlet1.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet1 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/armlet2.pp b/manifests/nodes/armlet2.pp deleted file mode 100644 index 7566249f..00000000 --- a/manifests/nodes/armlet2.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet2 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/armlet4.pp b/manifests/nodes/armlet4.pp deleted file mode 100644 index 10b0e0dd..00000000 --- a/manifests/nodes/armlet4.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet4 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/armlet6.pp b/manifests/nodes/armlet6.pp deleted file mode 100644 index ebe0da27..00000000 --- a/manifests/nodes/armlet6.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet6 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/armlet7.pp b/manifests/nodes/armlet7.pp deleted file mode 100644 index 929ae635..00000000 --- a/manifests/nodes/armlet7.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet7 { -# Location: Scaleway (Iliad/Online datacenter) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes/armlet9.pp b/manifests/nodes/armlet9.pp deleted file mode 100644 index de34834c..00000000 --- a/manifests/nodes/armlet9.pp +++ /dev/null @@ -1,7 +0,0 @@ -node armlet9 { -# Location: Scaleway (Iliad/Online datacenter) -# - 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 38f75ee1..57f68070 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -25,39 +25,18 @@ $nodes_ipaddr = { ipv4 => '212.85.158.153', ipv6 => '2a02:2178:2:7::9', }, - armagnac => { - ipv4 => '212.47.231.90', - }, armorique => { ipv4 => '212.47.242.112', }, - armlet1 => { - ipv4 => '163.172.148.228', - }, - armlet2 => { - ipv4 => '163.172.148.228', - }, armlet3 => { ipv4 => '163.172.148.228', }, - armlet4 => { - ipv4 => '163.172.148.228', - }, armlet5 => { ipv4 => '163.172.148.228', }, - armlet6 => { - ipv4 => '163.172.148.228', - }, - armlet7 => { - ipv4 => '163.172.148.228', - }, armlet8 => { ipv4 => '163.172.148.228', }, - armlet9 => { - ipv4 => '163.172.148.228', - }, friteuse => { ipv4 => '192.168.122.131', }, diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index 173b1cb7..4e245c30 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -42,6 +42,5 @@ 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.231.90 armagnac.<%= domain %> # testip ssh 212.47.242.112 armorique.<%= domain %> # testip ssh 163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp |