Adding missing default values and fixing bare Redis fetch for volume list.

This commit is contained in:
Joshua McKenty
2010-06-24 04:11:55 +01:00
committed by andy
parent 9526e1b3f1
commit 8c535fae46
2 changed files with 3 additions and 1 deletions
+1 -1
View File
@@ -72,7 +72,7 @@ class CloudController(object):
@property
def volumes(self):
""" returns a list of all volumes """
for volume_id in datastore.Redis.instance().smembers("volumes"):
for volume_id in datastore.Redis.instance().smembers("storage-volumes"):
volume = storage.Volume(volume_id=volume_id)
yield volume
+2
View File
@@ -165,9 +165,11 @@ class Volume(datastore.RedisModel):
vol['availability_zone'] = FLAGS.storage_availability_zone
vol["instance_id"] = 'none'
vol["mountpoint"] = 'none'
vol['attachTime'] = 'none'
vol["create_time"] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
vol['status'] = "creating" # creating | available | in-use
vol['attachStatus'] = "detached" # attaching | attached | detaching | detached
vol['deleteOnTermination'] = 'False'
vol.save()
vol.create_lv()
vol.setup_export()