diff options
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 5 | ||||
| -rw-r--r-- | manifests/nodes/armada.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 7c6061fd..675a3ab9 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -27,8 +27,8 @@ class mga_buildsystem::config { build_nodes => { 'i586' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1' ], 'x86_64' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1' ], - 'armv5tl' => [ 'armorique', 'armagnac', 'armada', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armlet8', 'armlet9' ], - 'armv7hl' => [ 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armorique', 'armagnac', 'armada', 'armlet8', 'armlet9' ], + 'armv5tl' => [ 'armorique', 'armagnac', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armlet8', 'armlet9' ], + 'armv7hl' => [ 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5', 'armlet6', 'armorique', 'armagnac', 'armlet8', 'armlet9' ], }, build_nodes_aliases => { 'jonund0' => "jonund.${::domain}", @@ -165,7 +165,6 @@ class mga_buildsystem::config { '85.134.55.73', $::nodes_ipaddr[armorique][ipv4], $::nodes_ipaddr[armagnac][ipv4], - $::nodes_ipaddr[armada][ipv4], $::nodes_ipaddr[armrest][ipv4], ] $repo_allow_from_domains = [ diff --git a/manifests/nodes/armada.pp b/manifests/nodes/armada.pp deleted file mode 100644 index 2b85e28a..00000000 --- a/manifests/nodes/armada.pp +++ /dev/null @@ -1,8 +0,0 @@ -node armada { -# 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 46266014..8e5e4773 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -53,9 +53,6 @@ $nodes_ipaddr = { armorique => { ipv4 => '212.47.242.112', }, - armada => { - ipv4 => '212.47.242.218', - }, armrest => { ipv4 => '163.172.153.185', }, diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index 6ba0bedb..eaab31db 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -51,5 +51,4 @@ group-compress VM Alamut group-compress Scaleway 212.47.231.90 armagnac.<%= domain %> # testip ssh 212.47.242.112 armorique.<%= domain %> # testip ssh -212.47.242.218 armada.<%= domain %> # testip ssh 163.172.153.185 armrest.<%= domain %> # testip ssh |