Commit 01e9f6d6 authored by Christos Stavrakakis's avatar Christos Stavrakakis

cyclades: Rename 'backend_id' to 'pithosmap'

Rename the 'backend_id' attribute of images to 'pithosmap'.
parent c650a03e
......@@ -170,7 +170,7 @@ def get_image_dict(image_id, user_id):
size = image["size"] = img["size"]
mapfile = image["mapfile"] = img["mapfile"]
image["backend_id"] = PITHOSMAP_PREFIX + "/".join([mapfile, str(size)])
image["pithosmap"] = PITHOSMAP_PREFIX + "/".join([mapfile, str(size)])
properties = img.get("properties", {})
image["metadata"] = dict((key.upper(), val)
......
......@@ -830,7 +830,7 @@ def create_instance(vm, nics, volumes, flavor, image):
kw['osparams'] = {
'config_url': vm.config_url,
# Store image id and format to Ganeti
'img_id': image['backend_id'],
'img_id': image['pithosmap'],
'img_format': image['format']}
# Use opportunistic locking
......
......@@ -200,7 +200,7 @@ def create_server(vm, nics, volumes, flavor, image, personality, password):
# If the root volume has a provider, then inform snf-image to not fill
# the volume with data
image_id = image["backend_id"]
image_id = image["pithosmap"]
root_volume = volumes[0]
if root_volume.volume_type.provider in settings.GANETI_CLONE_PROVIDERS:
image_id = "null"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment