git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f24252
)
spelling
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 15 Mar 2012 21:06:54 +0000
(17:06 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 15 Mar 2012 21:06:54 +0000
(17:06 -0400)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
5748a6a
..
b633b74
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-17,7
+17,7
@@
from sfa.util.osxrn import OSXrn
from sfa.rspecs.version_manager import VersionManager
from sfa.openstack.image import Image
from sfa.openstack.security_group import SecurityGroup
from sfa.rspecs.version_manager import VersionManager
from sfa.openstack.image import Image
from sfa.openstack.security_group import SecurityGroup
-
+from sfa.util.sfalogging import logger
def instance_to_sliver(instance, slice_xrn=None):
# should include?
def instance_to_sliver(instance, slice_xrn=None):
# should include?
@@
-188,7
+188,7
@@
class OSAggregate:
def reserve_instance(self, image_id, kernel_id, ramdisk_id, \
def reserve_instance(self, image_id, kernel_id, ramdisk_id, \
- instance_type, key_name, user_data):
+ instance_type, key_name, user_data
, group_name
):
conn = self.driver.euca_shell
logger.info('Reserving an instance: image: %s, kernel: ' + \
'%s, ramdisk: %s, type: %s, key: %s' % \
conn = self.driver.euca_shell
logger.info('Reserving an instance: image: %s, kernel: ' + \
'%s, ramdisk: %s, type: %s, key: %s' % \
@@
-201,7
+201,7
@@
class OSAggregate:
instance_type=instance_type,
key_name=key_name,
user_data = user_data,
instance_type=instance_type,
key_name=key_name,
user_data = user_data,
- security_groups=group_name
s
)
+ security_groups=group_name)
#placement=zone,
#min_count=min_count,
#max_count=max_count,
#placement=zone,
#min_count=min_count,
#max_count=max_count,