Merge "Use compute rpcapi in nova-manage."

This commit is contained in:
Jenkins
2012-06-01 16:08:50 +00:00
committed by Gerrit Code Review

View File

@@ -80,6 +80,7 @@ from nova.api.ec2 import ec2utils
from nova.auth import manager from nova.auth import manager
from nova.compat import flagfile from nova.compat import flagfile
from nova.compute import instance_types from nova.compute import instance_types
from nova.compute import rpcapi as compute_rpcapi
from nova import context from nova import context
from nova import crypto from nova import crypto
from nova import db from nova import db
@@ -1167,13 +1168,9 @@ class VolumeCommands(object):
print "volume is not attached to an instance" print "volume is not attached to an instance"
return return
instance = db.instance_get(ctxt, volume['instance_id']) instance = db.instance_get(ctxt, volume['instance_id'])
host = instance['host'] rpcapi = compute_rpcapi.ComputeAPI()
rpc.cast(ctxt, rpcapi.attach_volume(ctxt, instance, volume['id'],
rpc.queue_get_for(ctxt, FLAGS.compute_topic, host), volume['mountpoint'])
{"method": "attach_volume",
"args": {"instance_id": instance['id'],
"volume_id": volume['id'],
"mountpoint": volume['mountpoint']}})
class InstanceTypeCommands(object): class InstanceTypeCommands(object):