diff options
| author | Ken Pepple <ken.pepple@gmail.com> | 2011-04-07 15:09:48 -0700 |
|---|---|---|
| committer | Ken Pepple <ken.pepple@gmail.com> | 2011-04-07 15:09:48 -0700 |
| commit | 3c67f142e5587641e45fcf05d98fddffa0d67d9f (patch) | |
| tree | b4e27f3643da04294f8cbbff19a175a870e59965 /bin | |
| parent | 59b460e98c5b8f718a654539c5788e8775126dfd (diff) | |
| parent | 9616fba3e13567b1e84d951857eaf0463161fdbe (diff) | |
| download | nova-3c67f142e5587641e45fcf05d98fddffa0d67d9f.tar.gz nova-3c67f142e5587641e45fcf05d98fddffa0d67d9f.tar.xz nova-3c67f142e5587641e45fcf05d98fddffa0d67d9f.zip | |
merged trunk and resolved conflict
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 5369a98b3..e63898979 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -881,7 +881,7 @@ class InstanceTypeCommands(object): elif name == "--all": inst_types = instance_types.get_all_types(True) else: - inst_types = instance_types.get_instance_type(name) + inst_types = instance_types.get_instance_type_by_name(name) except exception.DBError, e: _db_error(e) if isinstance(inst_types.values()[0], dict): @@ -905,7 +905,7 @@ class ImageCommands(object): 'disk_format': disk_format, 'container_format': container_format, 'properties': {'image_state': 'available', - 'owner': owner, + 'owner_id': owner, 'type': image_type, 'architecture': architecture, 'image_location': 'local', @@ -983,7 +983,7 @@ class ImageCommands(object): 'is_public': True, 'name': old['imageId'], 'properties': {'image_state': old['imageState'], - 'owner': old['imageOwnerId'], + 'owner_id': old['imageOwnerId'], 'architecture': old['architecture'], 'type': old['type'], 'image_location': old['imageLocation'], |