Changeset 12428 for trunk

Timestamp:

01/24/11 14:49:09 (13 years ago)

Author:

ramonb

Message:

lisa/cfrun_hosts.lisa.cmt:

• cleanup of massive IF statement
• now also outputs software node

File:

• trunk/sara_cmt/templates/lisa/cfrun_hosts.lisa.cmt (modified) (1 diff)

trunk/sara_cmt/templates/lisa/cfrun_hosts.lisa.cmt

@@ -20 +20 @@
 maxchild=80
 batch1.irc.sara.nl
-    {% for hw in lisa_hosts %}
-            {% for i in hw.interfaces.all %}
-                {% if i.network.name == 'lisa admin' and "PowerEdge" in hw.specifications.name and "computenode" in hw.roles or i.network.name == 'lisa admin' and "PowerEdge 1950" in hw.specifications.name and "loginnode" in hw.roles and not "inactive" in hw.roles %} 
+
+{% for hw in lisa_hosts %}
+  {% for i in hw.interfaces.all %}
+    {% if i.network.name == 'lisa admin' %}
+      {% if not "inactive" in hw.roles and not "administration" in hw.roles and not "fileserver" in hw.roles %} 
+
 {{ i.fqdn }}
-                {% endif %}
-            {% endfor %}
-    {% endfor %}
+
+      {% endif %}
+    {% endif %}
+  {% endfor %}
+{% endfor %}
+
 {% endnoblanklines %}