aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2017-12-10 16:51:56 +0000
committerPascal Terjan <pterjan@mageia.org>2017-12-10 16:51:56 +0000
commit084d5bea5dd457e099f5b3d5567c007616e72da2 (patch)
tree34a06b93068b1615bda3789be94bd70a2807d831
parente42db75fe2e03036d2e7901fb9054fac1d5acfaf (diff)
downloadpuppet-084d5bea5dd457e099f5b3d5567c007616e72da2.tar
puppet-084d5bea5dd457e099f5b3d5567c007616e72da2.tar.gz
puppet-084d5bea5dd457e099f5b3d5567c007616e72da2.tar.bz2
puppet-084d5bea5dd457e099f5b3d5567c007616e72da2.tar.xz
puppet-084d5bea5dd457e099f5b3d5567c007616e72da2.zip
Kill champagne
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp2
-rw-r--r--manifests/nodes_ip.pp4
-rw-r--r--modules/xymon/templates/bb-hosts1
3 files changed, 0 insertions, 7 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index f6736a35..d2db50aa 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -160,8 +160,6 @@ class mga_buildsystem::config {
$::nodes_ipaddr[sucuk][ipv6],
$::nodes_ipaddr[krampouezh][ipv4],
$::nodes_ipaddr[krampouezh][ipv6],
- $::nodes_ipaddr[champagne][ipv4],
- $::nodes_ipaddr[champagne][ipv6],
'85.134.55.73',
$::nodes_ipaddr[armorique][ipv4],
$::nodes_ipaddr[armagnac][ipv4],
diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp
index d0751141..18c8470e 100644
--- a/manifests/nodes_ip.pp
+++ b/manifests/nodes_ip.pp
@@ -5,10 +5,6 @@ $nodes_ipaddr = {
ipv4 => '95.142.164.207',
ipv6 => '2001:4b98:dc0:51:216:3eff:fe6b:4ea9',
},
- champagne => {
- ipv4 => '217.70.188.116',
- ipv6 => '2001:4b98:dc0:41:216:3eff:fe4f:5a18',
- },
neru => {
ipv4 => '163.172.148.228',
ipv6 => '2001:bc8:4400:2800::4115',
diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts
index 2867073e..89926d1f 100644
--- a/modules/xymon/templates/bb-hosts
+++ b/modules/xymon/templates/bb-hosts
@@ -43,7 +43,6 @@ group-compress Marseille
group-compress Gandi
95.142.164.207 krampouezh.<%= domain %> # ssh dns ldap ldapssl smtp
-#217.70.188.116 champagne.<%= domain %> # ssh
group-compress VM Alamut
192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=192.168.122.131/ https://forums.<%= domain %>=192.168.122.131/