aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2018-03-04 14:26:57 +0000
committerPascal Terjan <pterjan@mageia.org>2018-03-04 14:26:57 +0000
commit283a48f789a73a84a31b9941acd28898b877674d (patch)
tree89ff65bdbdec0a93a405f448794f14a7503ace0a
parentdfd55e27e0bdce8291af348d825b6ffca91eecc9 (diff)
downloadpuppet-283a48f789a73a84a31b9941acd28898b877674d.tar
puppet-283a48f789a73a84a31b9941acd28898b877674d.tar.gz
puppet-283a48f789a73a84a31b9941acd28898b877674d.tar.bz2
puppet-283a48f789a73a84a31b9941acd28898b877674d.tar.xz
puppet-283a48f789a73a84a31b9941acd28898b877674d.zip
Kill krampouezh
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp2
-rw-r--r--manifests/nodes/krampouezh.pp14
-rw-r--r--manifests/nodes_ip.pp4
-rw-r--r--modules/xymon/templates/bb-hosts3
4 files changed, 0 insertions, 23 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index d2db50aa..62379d17 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -158,8 +158,6 @@ class mga_buildsystem::config {
$::nodes_ipaddr[rabbit][ipv6],
$::nodes_ipaddr[sucuk][ipv4],
$::nodes_ipaddr[sucuk][ipv6],
- $::nodes_ipaddr[krampouezh][ipv4],
- $::nodes_ipaddr[krampouezh][ipv6],
'85.134.55.73',
$::nodes_ipaddr[armorique][ipv4],
$::nodes_ipaddr[armagnac][ipv4],
diff --git a/manifests/nodes/krampouezh.pp b/manifests/nodes/krampouezh.pp
deleted file mode 100644
index 37fde92c..00000000
--- a/manifests/nodes/krampouezh.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# gandi-vm
-node krampouezh {
-# Location: gandi VM
-#
-#
- #include common::default_mageia_server
- include common::default_mageia_server_no_smtp
- include postfix::server::secondary
- timezone::timezone { 'Europe/Paris': }
-
- openldap::slave_instance { '1':
- rid => 1,
- }
-}
diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp
index 18c8470e..0ebae7f0 100644
--- a/manifests/nodes_ip.pp
+++ b/manifests/nodes_ip.pp
@@ -1,10 +1,6 @@
# Nodes IP addresses
$nodes_ipaddr = {
- krampouezh => {
- ipv4 => '95.142.164.207',
- ipv6 => '2001:4b98:dc0:51:216:3eff:fe6b:4ea9',
- },
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 89926d1f..c76b8e34 100644
--- a/modules/xymon/templates/bb-hosts
+++ b/modules/xymon/templates/bb-hosts
@@ -41,9 +41,6 @@ group-compress Marseille
212.85.158.153 duvel.<%= domain %> # testip ssh rsync svn git ldapssl ldap
#212.85.158.146 alamut.mageia.org # testip ssh
-group-compress Gandi
-95.142.164.207 krampouezh.<%= domain %> # ssh dns ldap ldapssl smtp
-
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/