Clean up ipv4 specific stuff and make custom require different rules from ipv4

inventory/group_vars/all

@@ -17,6 +17,7 @@ libdir: /usr/lib64
 udp_ports: []
 tcp_ports: []
 custom_rules: []
+custom6_rules: []
 
 # defaults for virt installs
 ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7

roles/base/templates/iptables/ip6tables

@@ -20,13 +20,8 @@
 # allow ssh - always
 -A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT
 
-# for nrpe - allow it from nocs
--A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 5666  -s 209.132.181.35 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT
-
 # if the host/group defines incoming tcp_ports - allow them
-{% if tcp_ports is defined %}
+{% if tcp6_ports is defined %}
 {% for port in tcp_ports %}
 -A INPUT -p tcp -m tcp --dport {{ port }} -j ACCEPT
 {% endfor %}
@@ -39,9 +34,9 @@
 {% endfor %}
 {% endif %}
 
-# if there are custom rules - put them in as-is
-{% if custom_rules is defined %}
-{% for rule in custom_rules %}
+# if there are custom6 rules - put them in as-is
+{% if custom6_rules is defined %}
+{% for rule in custom6_rules %}
 {{ rule }}
 {% endfor %}
 {% endif %}