diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-12 17:30:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-12 17:30:18 +0000 |
| commit | 2effda29c8926b87a240801acc4d61c62df0954b (patch) | |
| tree | 489fd665022926ec0a41c582fb9d2afbad6148f8 | |
| parent | e3b9477f1f596294020a37051c33cef1e29bc0c3 (diff) | |
| parent | 30bc1ef250f0230a9a1f562cd51b0f57d4a35912 (diff) | |
| download | nova-2effda29c8926b87a240801acc4d61c62df0954b.tar.gz nova-2effda29c8926b87a240801acc4d61c62df0954b.tar.xz nova-2effda29c8926b87a240801acc4d61c62df0954b.zip | |
Merge "Fix local variable 'root_uuid' ref before assign"
| -rw-r--r-- | nova/cmd/baremetal_deploy_helper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/cmd/baremetal_deploy_helper.py b/nova/cmd/baremetal_deploy_helper.py index d63d06ee9..539d5b517 100644 --- a/nova/cmd/baremetal_deploy_helper.py +++ b/nova/cmd/baremetal_deploy_helper.py @@ -201,6 +201,7 @@ def deploy(address, port, iqn, lun, image_path, pxe_config_path, login_iscsi(address, port, iqn) try: root_uuid = work_on_disk(dev, root_mb, swap_mb, image_path) + switch_pxe_config(pxe_config_path, root_uuid) except processutils.ProcessExecutionError as err: # Log output if there was a error LOG.error("Cmd : %s" % err.cmd) @@ -208,7 +209,6 @@ def deploy(address, port, iqn, lun, image_path, pxe_config_path, LOG.error("StdErr : %s" % err.stderr) finally: logout_iscsi(address, port, iqn) - switch_pxe_config(pxe_config_path, root_uuid) # Ensure the node started netcat on the port after POST the request. time.sleep(3) notify(address, 10000) |