diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2018-06-13 22:13:00 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2018-06-13 22:13:00 +0000 |
| commit | ae776705c7067376fa90d767c59bd4d8ce0dd3db (patch) | |
| tree | 183cbdadd79d75c0d1ac6eef7d8427456398a07f | |
| parent | 151bc7f061d6722c4400fed540dc5d06b85d745a (diff) | |
| download | puppet-ae776705c7067376fa90d767c59bd4d8ce0dd3db.tar puppet-ae776705c7067376fa90d767c59bd4d8ce0dd3db.tar.gz puppet-ae776705c7067376fa90d767c59bd4d8ce0dd3db.tar.bz2 puppet-ae776705c7067376fa90d767c59bd4d8ce0dd3db.tar.xz puppet-ae776705c7067376fa90d767c59bd4d8ce0dd3db.zip | |
Delete armrest, neru is now the gw
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 1 | ||||
| -rw-r--r-- | manifests/nodes/armrest.pp | 6 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 3 | ||||
| -rw-r--r-- | modules/xymon/templates/bb-hosts | 1 |
4 files changed, 0 insertions, 11 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index e61f736b..ac528843 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -161,7 +161,6 @@ class mga_buildsystem::config { '85.134.55.73', $::nodes_ipaddr[armorique][ipv4], $::nodes_ipaddr[armagnac][ipv4], - $::nodes_ipaddr[armrest][ipv4], $::nodes_ipaddr[neru][ipv4], $::nodes_ipaddr[neru][ipv6], '2001:bc8:4400:2700::2729', diff --git a/manifests/nodes/armrest.pp b/manifests/nodes/armrest.pp deleted file mode 100644 index e64cd036..00000000 --- a/manifests/nodes/armrest.pp +++ /dev/null @@ -1,6 +0,0 @@ -node armrest { -# Location: Scaleway (Iliad/Online datacenter) - include common::default_mageia_server - timezone::timezone { 'Europe/Paris': } - serial_console::serial_console { 'ttyS0': } -} diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 0ebae7f0..0086a67c 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -49,9 +49,6 @@ $nodes_ipaddr = { armorique => { ipv4 => '212.47.242.112', }, - armrest => { - ipv4 => '163.172.153.185', - }, friteuse => { ipv4 => '192.168.122.131', } diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index c76b8e34..9295368c 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -47,5 +47,4 @@ group-compress VM Alamut group-compress Scaleway 212.47.231.90 armagnac.<%= domain %> # testip ssh 212.47.242.112 armorique.<%= domain %> # testip ssh -163.172.153.185 armrest.<%= domain %> # testip ssh 163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp |