Fixed #111 -- move new_nodes out of conditional and delete nodes properly.

Author: mboersma

api/models.py

@@ -261,13 +261,13 @@ def scale_layers(self, **kwargs):
         """Scale layers up or down to match requested."""
         layers = self.layers.copy()
         funcs = []
+        new_nodes = False
         for layer_id, requested in layers.items():
             layer = self.layer_set.get(id=layer_id)
             nodes = list(layer.node_set.all().order_by('created'))
             diff = requested - len(nodes)
             if diff == 0:
                 continue
-            new_nodes = False
             while diff < 0:
                 node = nodes.pop(0)
                 funcs.append(node.terminate)

api/views.py

@@ -304,7 +304,6 @@ def get_object(self, *args, **kwargs):
     def destroy(self, request, **kwargs):
         node = self.get_object()
         node.destroy()
-        node.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

celerytasks/ec2.py

@@ -136,13 +136,10 @@ def terminate_node(node_id, creds, params, provider_id):
             i.update()
             if i.state == "terminated":
                 break
-    # pull the node from the database
+    # delete the node from the database
     node = Node.objects.get(uuid=node_id)
     chef_id = node.id
-    node.provider_id = None
-    node.fqdn = None
-    node.metadata = {}
-    node.save()
+    node.delete()
     # purge the node & client records from chef server
     client = ChefAPI(settings.CHEF_SERVER_URL,
                      settings.CHEF_CLIENT_NAME,