nagios: move the ipv6 specific ping config to a ping-ipv6.cfg file

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

roles/nagios_server/files/nagios/services/ping-ipv6.cfg

@@ -0,0 +1,6 @@
+ define service {
+   host_name            nagios-external.fedoraproject.org                            
+   service_description          ICMP-Ping6-check
+   check_command                        check-host-alive6!fedorapeople.org!1500.0,20%!2500.0,80%
+   use                          criticaltemplate
+ }

roles/nagios_server/files/nagios/services/ping.cfg

@@ -0,0 +1,13 @@
+define service {
+  hostgroup_name		all,!no_ping, !buildvm_armv7, !buildvm_s390x
+  service_description		ICMP-Ping4
+  check_command			check_ping4!350.0,20%!500.0,60%
+  use				criticaltemplate
+}
+
+define service {
+  hostgroup_name		buildvm_armv7, buildvm_s390x
+  service_description		ICMP-Ping4-vm-builders
+  check_command			check_ping4!1500.0,20%!2500.0,80%
+  use				criticaltemplate
+}

roles/nagios_server/tasks/main.yml

@@ -147,16 +147,6 @@
   - nagios_server
   notify: restart nagios
 
-## Copy over the template command scripts
-- name: Copy /etc/nagios/commands (templates)
-  template: src=nagios/commands/{{ item }} dest=/etc/nagios/commands/{{ item }}
-  with_items:
-    - ping.cfg
-  tags:
-  - nagios_config
-  - nagios_server
-  notify: restart nagios
-
 ## Copy over the contacts
 - name: Copy /etc/nagios/contacts
   synchronize: src=nagios/contacts/ dest=/etc/nagios/contacts/
@@ -265,6 +255,7 @@
     - smtp-mm.cfg
     - unbound.cfg
     - templates.cfg
+    - ping-ipv6.cfg
   tags:
   - nagios_config
   - nagios_server

roles/nagios_server/templates/nagios/services/ping.cfg

@@ -1,22 +0,0 @@
-define service {
-  hostgroup_name		all,!no_ping, !buildvm_armv7, !buildvm_s390x
-  service_description		ICMP-Ping4
-  check_command			check_ping4!350.0,20%!500.0,60%
-  use				criticaltemplate
-}
-
-define service {
-  hostgroup_name		buildvm_armv7, buildvm_s390x
-  service_description		ICMP-Ping4-vm-builders
-  check_command			check_ping4!1500.0,20%!2500.0,80%
-  use				criticaltemplate
-}
-
-{% if vars['nagios_location'] == 'external' %}                                                       
- define service {
-   host_name            nagios-external.fedoraproject.org                            
-   service_description          ICMP-Ping6-check
-   check_command                        check-host-alive6!fedorapeople.org!1500.0,20%!2500.0,80%
-   use                          criticaltemplate
- }
-{% endif %}