summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-19 21:32:15 +0000
committerGerrit Code Review <review@openstack.org>2013-06-19 21:32:15 +0000
commit5f67e3effd76b8883766449f5a51aeb7a85f5226 (patch)
treeeaa12d6f5b1620692135b81723c1d0dc03ccae55
parent07840c147bfdd73f7fff372d8ce555c4b4fd97f8 (diff)
parent703cdd82f773e57daef56128ca103eb810be9644 (diff)
downloadnova-5f67e3effd76b8883766449f5a51aeb7a85f5226.tar.gz
nova-5f67e3effd76b8883766449f5a51aeb7a85f5226.tar.xz
nova-5f67e3effd76b8883766449f5a51aeb7a85f5226.zip
Merge "Retry the sfdisk command up to 3 times."
-rw-r--r--nova/cmd/baremetal_deploy_helper.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/cmd/baremetal_deploy_helper.py b/nova/cmd/baremetal_deploy_helper.py
index 8586e6e59..c28c0eef1 100644
--- a/nova/cmd/baremetal_deploy_helper.py
+++ b/nova/cmd/baremetal_deploy_helper.py
@@ -91,6 +91,7 @@ def make_partitions(dev, root_mb, swap_mb):
stdin_command = ('1,%d,83;\n,%d,82;\n0,0;\n0,0;\n' % (root_mb, swap_mb))
utils.execute('sfdisk', '-uM', dev, process_input=stdin_command,
run_as_root=True,
+ attempts=3,
check_exit_code=[0])
# avoid "device is busy"
time.sleep(3)