summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-20 10:43:06 +0000
committerGerrit Code Review <review@openstack.org>2013-06-20 10:43:06 +0000
commit75ead3a2a37efbc6a4fdea7e492ca41cdd559a8c (patch)
treed6d002cb13a4b2d250a9aa438a449d4a894d58aa
parentdb4ed38f14ab507350e63e968d9040d80acb7bbd (diff)
parentf8b4b6a78fec0f388f3224c6faa06637878530b4 (diff)
downloadnova-75ead3a2a37efbc6a4fdea7e492ca41cdd559a8c.tar.gz
nova-75ead3a2a37efbc6a4fdea7e492ca41cdd559a8c.tar.xz
nova-75ead3a2a37efbc6a4fdea7e492ca41cdd559a8c.zip
Merge "Add err_msg param to baremetal_deploy_helper."
-rw-r--r--nova/cmd/baremetal_deploy_helper.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/cmd/baremetal_deploy_helper.py b/nova/cmd/baremetal_deploy_helper.py
index c28c0eef1..7b9b51e11 100644
--- a/nova/cmd/baremetal_deploy_helper.py
+++ b/nova/cmd/baremetal_deploy_helper.py
@@ -288,10 +288,14 @@ class BareMetalDeploy(object):
port = q.get('p', '3260')
iqn = q['n']
lun = q.get('l', '1')
+ err_msg = q.get('e')
except KeyError as e:
start_response('400 Bad Request', [('Content-type', 'text/plain')])
return "parameter '%s' is not defined" % e
+ if err_msg:
+ LOG.error('Deploy agent error message: ' + err_msg)
+
context = nova_context.get_admin_context()
d = db.bm_node_get(context, node_id)