Merge "Add call to vol driver when accepting a transfer"
This commit is contained in:
		@@ -36,7 +36,7 @@ volume_transfer_opts = [
 | 
			
		||||
               help='The number of characters in the salt.'),
 | 
			
		||||
    cfg.IntOpt('volume_transfer_key_length', default=16,
 | 
			
		||||
               help='The number of characters in the '
 | 
			
		||||
                'autogenerated auth key.'), ]
 | 
			
		||||
               'autogenerated auth key.'), ]
 | 
			
		||||
 | 
			
		||||
FLAGS = flags.FLAGS
 | 
			
		||||
FLAGS.register_opts(volume_transfer_opts)
 | 
			
		||||
@@ -178,6 +178,7 @@ class API(base.Base):
 | 
			
		||||
        try:
 | 
			
		||||
            # Transfer ownership of the volume now, must use an elevated
 | 
			
		||||
            # context.
 | 
			
		||||
            self.volume_api.accept_transfer(context, vol_ref)
 | 
			
		||||
            self.db.transfer_accept(context.elevated(),
 | 
			
		||||
                                    transfer_id,
 | 
			
		||||
                                    context.user_id,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user