summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-29 11:04:45 +0000
committerGerrit Code Review <review@openstack.org>2013-06-29 11:04:45 +0000
commit94aad08cfbefb19ec0bb995cac8c8f30e974e214 (patch)
tree0ea469383ed75077104a4a1487199c93e7a3e6fa
parent98a481aa4a121ef2a2e5fe338c4b9ab4f242cc29 (diff)
parent6bde383b4e539000a6dd0ec52763b6d09f4c870e (diff)
downloadnova-94aad08cfbefb19ec0bb995cac8c8f30e974e214.tar.gz
nova-94aad08cfbefb19ec0bb995cac8c8f30e974e214.tar.xz
nova-94aad08cfbefb19ec0bb995cac8c8f30e974e214.zip
Merge "fix invalid logging"
-rw-r--r--nova/virt/xenapi/volume_utils.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py
index 7a0b4a67e..853bc3262 100644
--- a/nova/virt/xenapi/volume_utils.py
+++ b/nova/virt/xenapi/volume_utils.py
@@ -233,8 +233,16 @@ def parse_volume_info(connection_data):
target_host = _get_target_host(target_portal)
target_port = _get_target_port(target_portal)
target_iqn = connection_data['target_iqn']
- LOG.debug('(vol_id,number,host,port,iqn): (%s,%s,%s,%s)',
- (volume_id, target_host, target_port, target_iqn))
+
+ log_params = {
+ "vol_id": volume_id,
+ "host": target_host,
+ "port": target_port,
+ "iqn": target_iqn
+ }
+ LOG.debug(_('(vol_id,host,port,iqn): '
+ '(%(vol_id)s,%(host)s,%(port)s,%(iqn)s)'), log_params)
+
if (volume_id is None or
target_host is None or
target_iqn is None):