Merge lp:~blake-rouse/maas/fix-1375427 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Remove the deprecated boot images warning from the cluster edit page.

[Newell Jensen (newell-jensen)]

Looks good.

review: Approve

=== removed file 'src/maasserver/templates/maasserver/bootimage-list.html'
--- src/maasserver/templates/maasserver/bootimage-list.html	2014-05-02 14:26:44 +0000
+++ src/maasserver/templates/maasserver/bootimage-list.html	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-{% extends "maasserver/base.html" %}
-
-{% block nav-active-result-list %}active{% endblock %}
-{% block title %}Boot Image list{% endblock %}
-{% block page-title %}
-{{ paginator.count }} boot image{{ paginator.count|pluralize }}
-in cluster {{ nodegroup.cluster_name }}
-{% endblock %}
-
-{% block html_includes %}{% include "maasserver/snippets.html" %}
-{% endblock %}
-
-{% block content %}
-    <div id="results">
-      <h2>Boot images in cluster <a href="{% url 'cluster-edit' nodegroup.uuid %}">{{ nodegroup.cluster_name }}</a></h2>
-      {% if not paginator.count %}
-        {% include "maasserver/no-bootimages-warning.html" %}
-      {% else %}
-        <table class="list">
-          <thead>
-            <tr>
-              <th>ID</th>
-              <th>OS</th>
-              <th>Release</th>
-              <th>Architecture</th>
-              <th>Subarchitecture</th>
-              <th>Purpose</th>
-              <th>Label</th>
-              <th>Imported on</th>
-            </tr>
-          </thead>
-          <tbody>
-        {% for bootimage in bootimage_list %}
-          <tr class="bootimage {% cycle 'even' 'odd' %}">
-            <td>{{ bootimage.id }}</td>
-            <td>{{ bootimage.osystem }}</td>
-            <td>{{ bootimage.release }}</td>
-            <td>{{ bootimage.architecture }}</td>
-            <td>{{ bootimage.subarchitecture }}</td>
-            <td>{{ bootimage.purpose }}</td>
-            <td>{{ bootimage.label }}</td>
-            <td>{{ bootimage.updated }}</td>
-          </tr>
-          {% endfor %}
-          </tbody>
-        </table>
-      {% include "maasserver/pagination.html" %}
-      {% endif %}         
-      <div class="clear"></div>
-    </div>
-
-{% endblock %}

=== removed file 'src/maasserver/templates/maasserver/no-bootimages-warning.html'
--- src/maasserver/templates/maasserver/no-bootimages-warning.html	2014-05-27 10:13:57 +0000
+++ src/maasserver/templates/maasserver/no-bootimages-warning.html	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<p id="no_boot_images_warning">Warning: this cluster has no boot images!</p>
-<p>
-  This cluster needs boot images in order to boot the nodes it controls.
-  Make sure that the cluster controller has access to the Ubuntu archive, and
-  start the import by clicking the "Import boot images" button on the
-  <a href="{% url 'cluster-list' %}">cluster listing page</a>.
-</p>

=== modified file 'src/maasserver/templates/maasserver/nodegroup_edit.html'
--- src/maasserver/templates/maasserver/nodegroup_edit.html	2014-09-02 08:18:39 +0000
+++ src/maasserver/templates/maasserver/nodegroup_edit.html	2014-09-29 21:35:25 +0000
@@ -64,15 +64,6 @@
       </table>
       <a class="button right"
          href="{% url 'cluster-interface-create' cluster.uuid %}">Add interface</a>
-
-      <div class="clear"></div>
-      <h2>Boot images</h2>
-      {% if not cluster.bootimage_set.count %}
-      {% include "maasserver/no-bootimages-warning.html" %}
-      {% else %}
-      This cluster has {{ cluster.bootimage_set.count }} boot images.
-      <a href="{% url 'cluster-bootimages-list' cluster.uuid %}">View boot image list</a>.
-      {% endif %}         
     </form>
   </div>
   <div class="clear"></div>