Merge pull request #345 from opdemand/344-layer-query-fix

Fixed #344 - fixed query in several build_layer() implementations.

Author: Gabriel Monroy

provider/digitalocean.py

@@ -43,7 +43,7 @@ def build_layer(layer):
     params = {'name': name, 'ssh_pub_key': layer['ssh_public_key']}
     conn.request('/ssh_keys/new/', method='GET', params=params)
     # Digital Ocean images only have the root user created by default
-    l = Layer.objects.get(id=layer['id'])
+    l = Layer.objects.get(id=layer['id'], formation__id=layer['formation'])
     l.ssh_username = 'root'
     l.save()
 

provider/rackspace.py

@@ -59,8 +59,7 @@ def build_layer(layer):
     # import a new keypair using the layer key material
     conn.keypairs.create(name, layer['ssh_public_key'])
     # Rackspace images only have the root user created by default
-    # TODO: this seems like a smelly hack...
-    layer_ = Layer.objects.get(id=layer['id'])
+    layer_ = Layer.objects.get(id=layer['id'], formation__id=layer['formation'])
     layer_.ssh_username = 'root'
     layer_.save()
 

provider/vagrant.py

@@ -50,7 +50,7 @@ def build_layer(layer):
     """
 
     # This can also be done with `deis layers:update` now.
-    layer_ = Layer.objects.get(id=layer['id'])
+    layer_ = Layer.objects.get(id=layer['id'], formation__id=layer['formation'])
     layer_.ssh_username = 'vagrant'
     layer_.save()