Merge "Add storageHost content to volume messages."

cinder/tests/test_volume.py

@@ -343,6 +343,7 @@ class VolumeTestCase(BaseVolumeTestCase):
         self.assertEqual(msg['event_type'], 'volume.create.start')
         expected = {
             'status': 'creating',
+            'host': socket.gethostname(),
             'display_name': 'test_volume',
             'availability_zone': 'nova',
             'tenant_id': 'fake',

cinder/volume/utils.py

@@ -41,6 +41,7 @@ def null_safe_str(s):
 
 def _usage_from_volume(context, volume_ref, **kw):
     usage_info = dict(tenant_id=volume_ref['project_id'],
+                      host=volume_ref['host'],
                       user_id=volume_ref['user_id'],
                       instance_uuid=volume_ref['instance_uuid'],
                       availability_zone=volume_ref['availability_zone'],