library/roles/iptables: do not set ganglia or nagios rules if not explicitly told.

d4science-ghn-cluster/roles/smartgears: specific tasks to manage the egi images
d4science-ghn-cluster/roles/smartgears/templates/smartgears-setup.sh.j2: script to setup the container when the image is first activated.
This commit is contained in:
Andrea Dell'Amico 2015-10-07 14:48:22 +02:00
parent 98598de8ae
commit 304a25e564
2 changed files with 7 additions and 0 deletions

View File

@ -40,3 +40,6 @@
#iptables_default_policy: REJECT #iptables_default_policy: REJECT
iptables_default_policy: ACCEPT iptables_default_policy: ACCEPT
ganglia_enabled: False
nagios_enabled: False

View File

@ -133,6 +133,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if nagios_enabled %}
{% if nagios_monitoring_server_ip is defined %} {% if nagios_monitoring_server_ip is defined %}
{% for ip in nagios_monitoring_server_ip %} {% for ip in nagios_monitoring_server_ip %}
# Nagios NRPE # Nagios NRPE
@ -141,6 +142,7 @@
-A INPUT -s {{ ip }} -p udp -m udp --dport 123 -j ACCEPT -A INPUT -s {{ ip }} -p udp -m udp --dport 123 -j ACCEPT
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endif %}
{% if munin_server is defined and configure_munin is defined and configure_munin %} {% if munin_server is defined and configure_munin is defined and configure_munin %}
{% for ip in munin_server %} {% for ip in munin_server %}
@ -149,6 +151,7 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if ganglia_enabled %}
{% if ganglia_gmond_cluster_port is defined %} {% if ganglia_gmond_cluster_port is defined %}
# Ganglia # Ganglia
{% if ganglia_gmond_use_jmxtrans is not defined or not ganglia_gmond_use_jmxtrans %} {% if ganglia_gmond_use_jmxtrans is not defined or not ganglia_gmond_use_jmxtrans %}
@ -160,6 +163,7 @@
-A INPUT -m state --state NEW -s {{ ganglia_gmetad_host }} -p tcp -m tcp --dport {{ ganglia_gmond_cluster_port }} -j ACCEPT -A INPUT -m state --state NEW -s {{ ganglia_gmetad_host }} -p tcp -m tcp --dport {{ ganglia_gmond_cluster_port }} -j ACCEPT
-A INPUT -s {{ ganglia_gmetad_host }} -p udp -m udp --dport {{ ganglia_gmond_cluster_port }} -j ACCEPT -A INPUT -s {{ ganglia_gmetad_host }} -p udp -m udp --dport {{ ganglia_gmond_cluster_port }} -j ACCEPT
{% endif %} {% endif %}
{% endif %}
{% if postfix_relay_server is defined and postfix_relay_server %} {% if postfix_relay_server is defined and postfix_relay_server %}
# #