From 82181c2eb2805ba2128cb373815b383b2438df2d Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Wed, 13 Feb 2019 13:30:16 +0100 Subject: [PATCH] Remove forseti/checkmk --- hosts | 1 - roles/checkmk-agent/tasks/main.yml | 19 ------------------- roles/dhcpd/templates/dhcp/dhcpd.conf.j2 | 5 ----- .../bind/23.172.in-addr.arpa.zone.j2 | 3 +-- .../templates/bind/binary.kitchen.zone.j2 | 4 +--- site.yml | 5 ----- 6 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 roles/checkmk-agent/tasks/main.yml diff --git a/hosts b/hosts index 3fee0ab..78cc188 100644 --- a/hosts +++ b/hosts @@ -3,7 +3,6 @@ bacon.binary.kitchen ansible_host=172.23.2.3 aveta.binary.kitchen ansible_host=172.23.2.4 sulis.binary.kitchen ansible_host=172.23.2.5 nabia.binary.kitchen ansible_host=172.23.2.6 -forseti.binary.kitchen ansible_host=172.23.2.7 #pizza.binary.kitchen ansible_host=172.23.2.33 #apfelkuchen.binary.kitchen ansible_host=172.23.2.34 #schweinshaxn.binary.kitchen ansible_host=172.23.2.36 diff --git a/roles/checkmk-agent/tasks/main.yml b/roles/checkmk-agent/tasks/main.yml deleted file mode 100644 index d82df55..0000000 --- a/roles/checkmk-agent/tasks/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- - -- name: Download Check_MK Agent - get_url: - dest: /opt/check-mk-agent_1.4.0p34-1_all.deb - mode: 0644 - validate_certs: no - url: https://forseti.binary.kitchen/bk/check_mk/agents/check-mk-agent_1.5.0b7-1_all.deb - -- name: Install Check_MK Agent dependencies - apt: name={{ item }} - with_items: - - xinetd - -- name: Install Check_MK Agent - apt: - deb: "/opt/check-mk-agent_1.5.0b7-1_all.deb" - state: present - diff --git a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 index a2726fc..34155d0 100644 --- a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 +++ b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 @@ -108,11 +108,6 @@ host cashdesk { fixed-address cashdesk.binary.kitchen; } -host forseti { - hardware ethernet 52:54:00:17:02:07; - fixed-address forseti.binary.kitchen; -} - host garlic { hardware ethernet b8:27:eb:56:2b:7c; fixed-address garlic.binary.kitchen; diff --git a/roles/dns-intern/templates/bind/23.172.in-addr.arpa.zone.j2 b/roles/dns-intern/templates/bind/23.172.in-addr.arpa.zone.j2 index ecd00ba..8725b3e 100644 --- a/roles/dns-intern/templates/bind/23.172.in-addr.arpa.zone.j2 +++ b/roles/dns-intern/templates/bind/23.172.in-addr.arpa.zone.j2 @@ -1,7 +1,7 @@ $ORIGIN 23.172.in-addr.arpa. ; base for unqualified names $TTL 1h ; default time-to-live @ IN SOA ns.binary.kitchen. hostmaster.binary.kitchen. ( - 2019020400; serial + 2019021300; serial 1d; refresh 2h; retry 4w; expire @@ -37,7 +37,6 @@ $TTL 1h ; default time-to-live 4.2 IN PTR aveta.binary.kitchen. 5.2 IN PTR sulis.binary.kitchen. 6.2 IN PTR nabia.binary.kitchen. -7.2 IN PTR forseti.binary.kitchen. 11.2 IN PTR homer.binary.kitchen. 12.2 IN PTR lock.binary.kitchen. 13.2 IN PTR matrix.binary.kitchen. diff --git a/roles/dns-intern/templates/bind/binary.kitchen.zone.j2 b/roles/dns-intern/templates/bind/binary.kitchen.zone.j2 index 82a20d2..d919e1f 100644 --- a/roles/dns-intern/templates/bind/binary.kitchen.zone.j2 +++ b/roles/dns-intern/templates/bind/binary.kitchen.zone.j2 @@ -1,7 +1,7 @@ $ORIGIN binary.kitchen ; base for unqualified names $TTL 1h ; default time-to-live @ IN SOA ns.binary.kitchen. hostmaster.binary.kitchen. ( - 2019020400; serial + 2019021300; serial 1d; refresh 2h; retry 4w; expire @@ -12,7 +12,6 @@ $TTL 1h ; default time-to-live IN A 213.166.246.4 www IN A 213.166.246.4 ; Aliases -checkmk IN A 172.23.2.7 ldap IN A 172.23.2.3 ldap IN A 172.23.2.4 ldap IN A 213.166.246.2 @@ -52,7 +51,6 @@ bacon IN A 172.23.2.3 aveta IN A 172.23.2.4 sulis IN A 172.23.2.5 nabia IN A 172.23.2.6 -forseti IN A 172.23.2.7 homer IN A 172.23.2.11 lock IN A 172.23.2.12 matrix IN A 172.23.2.13 diff --git a/site.yml b/site.yml index 8c556fa..5098b04 100644 --- a/site.yml +++ b/site.yml @@ -31,11 +31,6 @@ - uau - acme -- name: Install Check_MK Agent - hosts: [bacon.binary.kitchen,forseti.binary.kitchen] - roles: - - checkmk-agent - - name: Setup ldap server hosts: helium.binary-kitchen.net roles: