Revision e5d15648
| b/snf-cyclades-app/synnefo/api/servers.py | ||
|---|---|---|
| 295 | 295 |
properties = img.get('properties', {})
|
| 296 | 296 |
image['backend_id'] = img['location'] |
| 297 | 297 |
image['format'] = img['disk_format'] |
| 298 |
image['checksum'] = img['checksum'] |
|
| 298 | 299 |
image['metadata'] = dict((key.upper(), val) \ |
| 299 | 300 |
for key, val in properties.items()) |
| 300 | 301 |
|
| b/snf-cyclades-app/synnefo/logic/backend.py | ||
|---|---|---|
| 312 | 312 |
kw['disks'][0]['provider'] = provider |
| 313 | 313 |
|
| 314 | 314 |
if provider == 'vlmc': |
| 315 |
kw['disks'][0]['origin'] = image['backend_id']
|
|
| 315 |
kw['disks'][0]['origin'] = image['checksum']
|
|
| 316 | 316 |
|
| 317 | 317 |
kw['nics'] = [public_nic] |
| 318 | 318 |
if settings.GANETI_USE_HOTPLUG: |
| ... | ... | |
| 339 | 339 |
if personality: |
| 340 | 340 |
kw['osparams']['img_personality'] = json.dumps(personality) |
| 341 | 341 |
|
| 342 |
if provider != None and provider == 'vlmc':
|
|
| 342 |
if provider == 'vlmc': |
|
| 343 | 343 |
kw['osparams']['img_id'] = 'null' |
| 344 | 344 |
|
| 345 | 345 |
kw['osparams']['img_properties'] = json.dumps(image['metadata']) |
Also available in: Unified diff