aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2019-07-06 19:31:37 +0300
committerThomas Backlund <tmb@mageia.org>2019-07-06 19:31:37 +0300
commit66f9df199515d4d4eabd02ffffc33a8d768d3335 (patch)
tree78c019e4fd3368e6ed793b9149e5e9db831a8c2e
parent81381c7b5011652d2d58ab0fb4ac2f85eed6155d (diff)
downloadpuppet-66f9df199515d4d4eabd02ffffc33a8d768d3335.tar
puppet-66f9df199515d4d4eabd02ffffc33a8d768d3335.tar.gz
puppet-66f9df199515d4d4eabd02ffffc33a8d768d3335.tar.bz2
puppet-66f9df199515d4d4eabd02ffffc33a8d768d3335.tar.xz
puppet-66f9df199515d4d4eabd02ffffc33a8d768d3335.zip
drop ancient arm1/2 nodes
-rw-r--r--deployment/main_mirror/templates/rsyncd.conf2
-rw-r--r--[-rwxr-xr-x]manifests/nodes/alamut.pp14
-rw-r--r--manifests/nodes/arm1.pp5
-rw-r--r--manifests/nodes/arm2.pp5
-rw-r--r--manifests/nodes_ip.pp6
5 files changed, 0 insertions, 32 deletions
diff --git a/deployment/main_mirror/templates/rsyncd.conf b/deployment/main_mirror/templates/rsyncd.conf
index 9de778f4..ab778a4a 100644
--- a/deployment/main_mirror/templates/rsyncd.conf
+++ b/deployment/main_mirror/templates/rsyncd.conf
@@ -11,8 +11,6 @@ gid = nogroup
rabbit.<%= domain %> \
alamut.<%= domain %> \
sucuk.<%= domain %> \
- arm1.<%= domain %> \
- arm2.<%= domain %> \
distrib-coffee.ipsl.jussieu.fr \
distribipsl.aero.jussieu.fr \
152.19.134.30 \
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp
index 29cddcf5..34285b3e 100755..100644
--- a/manifests/nodes/alamut.pp
+++ b/manifests/nodes/alamut.pp
@@ -63,18 +63,4 @@ node alamut {
include libvirtd::kvm
include wikis
-
- # Forward ports to arm1 and arm2 ssh, to access them from outside
- xinetd::port_forward {'forward_arm1':
- target_ip => "arm1.${::domain}",
- target_port => '22',
- port => '4251',
- proto => 'tcp',
- }
- xinetd::port_forward {'forward_arm2':
- target_ip => "arm2.${::domain}",
- target_port => '22',
- port => '4252',
- proto => 'tcp',
- }
}
diff --git a/manifests/nodes/arm1.pp b/manifests/nodes/arm1.pp
deleted file mode 100644
index 6409f9b4..00000000
--- a/manifests/nodes/arm1.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-node arm1 {
-# Location: IELO datacenter (marseille)
- include common::default_mageia_server
- timezone::timezone { 'Europe/Paris': }
-}
diff --git a/manifests/nodes/arm2.pp b/manifests/nodes/arm2.pp
deleted file mode 100644
index 2cd94b71..00000000
--- a/manifests/nodes/arm2.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-node arm2 {
-# 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 e9ac8b02..c3d85fa0 100644
--- a/manifests/nodes_ip.pp
+++ b/manifests/nodes_ip.pp
@@ -37,12 +37,6 @@ $nodes_ipaddr = {
ipv4 => '212.85.158.153',
ipv6 => '2a02:2178:2:7::9',
},
- arm1 => {
- ipv4 => '10.42.0.51',
- },
- arm2 => {
- ipv4 => '10.42.0.52',
- },
armagnac => {
ipv4 => '212.47.231.90',
},