git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstreammaster'
[sfa.git]
/
sfa
/
openstack
/
osaggregate.py
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
23ca79a
..
3de5627
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-52,7
+52,9
@@
def instance_to_sliver(instance, slice_xrn=None):
def ec2_id(id=None, type=None):
- ec2_id = None
+ ec2_id = None
+ if type == 'ovf':
+ type = 'ami'
if id and type:
ec2_id = CloudController.image_ec2_id(id, type)
return ec2_id