diff options
| author | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-09-02 11:01:05 -0500 |
|---|---|---|
| committer | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-09-02 11:01:05 -0500 |
| commit | ef1df6eb8ba69224216ed2d3afc7455abfd342ce (patch) | |
| tree | 1db78aed4035df4e834bcc0fca64b7a9d70180d5 /bin | |
| parent | f119805aa7c8e2dd7f0bafe666d976f3a0c08795 (diff) | |
| parent | d80dc5bbbd1781bd33d9f69b608014e9cc2e41a3 (diff) | |
| download | nova-ef1df6eb8ba69224216ed2d3afc7455abfd342ce.tar.gz nova-ef1df6eb8ba69224216ed2d3afc7455abfd342ce.tar.xz nova-ef1df6eb8ba69224216ed2d3afc7455abfd342ce.zip | |
pull-up from trunk
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 c9cf4266d..c3b2c71ce 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -166,7 +166,7 @@ class VpnCommands(object): print address, print vpn['host'], print ec2utils.id_to_ec2_id(vpn['id']), - print vpn['state_description'], + print vpn['vm_state'], print state else: print None @@ -869,7 +869,7 @@ class VmCommands(object): instance['hostname'], instance['host'], instance['instance_type'].name, - instance['state_description'], + instance['vm_state'], instance['launched_at'], instance['image_ref'], instance['kernel_id'], @@ -1223,7 +1223,7 @@ class VsaCommands(object): type=vc['instance_type']['name'], fl_ip=floating_addr, fx_ip=fixed_addr, - stat=vc['state_description'], + stat=vc['vm_state'], host=vc['host'], time=str(vc['created_at'])) |