Merged to trunk

1 files changed, 7 insertions, 0 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 7835ca551..e4c0684c4 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -579,6 +579,13 @@ class VolumeCommands(object):
         ctxt = context.get_admin_context()
         volume = db.volume_get(ctxt, param2id(volume_id))
         host = volume['host']
+
+        if not host:
+            print "Volume not yet assigned to host."
+            print "Deleting volume from database and skipping rpc."
+            db.volume_destroy(ctxt, param2id(volume_id))
+            return
+
         if volume['status'] == 'in-use':
             print "Volume is in-use."
             print "Detach volume from instance and then try again."