Interdiff:
---
doc/move-instance.rst | 11 ++++++-----
tools/move-instance | 14 +++++++-------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/doc/move-instance.rst b/doc/move-instance.rst
index 14e5c35..2478b70 100644
--- a/doc/move-instance.rst
+++ b/doc/move-instance.rst
@@ -16,7 +16,8 @@ in the :doc:`Ganeti 2.2 design document <design-2.2>`. The
instance move
tool talks to the Ganeti clusters via RAPI and can run on any machine
which can connect to the cluster's RAPI. Despite their similar name, the
instance move tool should not be confused with the ``gnt-instance move``
-command, which is used to move an instance within the cluster.
+command, which is used to move without changes (instead of export/import
+plus rename) an instance within the cluster.
Configuring clusters for instance moves
@@ -25,10 +26,10 @@ Configuring clusters for instance moves
To prevent third parties from accessing the instance data, all data
exchanged between the clusters is signed using a secret key, the
"cluster domain secret". It is recommended to assign the same domain
-secret to all clusters of the same type, so that instances can be easily
-moved between them. By checking the signatures, the destination cluster
-can be sure the third party (e.g. this tool) didn't modify the received
-crypto keys and connection information.
+secret to all clusters of the same security domain, so that instances
+can be easily moved between them. By checking the signatures, the
+destination cluster can be sure the third party (e.g. this tool) didn't
+modify the received crypto keys and connection information.
.. highlight:: sh
diff --git a/tools/move-instance b/tools/move-instance
index 93ff153..ef3dd8d 100755
--- a/tools/move-instance
+++ b/tools/move-instance
@@ -640,17 +640,17 @@ class MoveSourceWorker(workerpool.BaseWorker):
mrt = MoveRuntime(move)
logging.debug("Starting destination thread")
- source_thread = threading.Thread(name="DestFor%s" % self.getName(),
- target=mrt.HandleErrors,
- args=("dest", MoveDestExecutor,
- rapi_factory.GetDestClient(),
- mrt, ))
- source_thread.start()
+ dest_thread = threading.Thread(name="DestFor%s" % self.getName(),
+ target=mrt.HandleErrors,
+ args=("dest", MoveDestExecutor,
+ rapi_factory.GetDestClient(),
+ mrt, ))
+ dest_thread.start()
try:
mrt.HandleErrors("src", MoveSourceExecutor,
rapi_factory.GetSourceClient(), mrt)
finally:
- source_thread.join()
+ dest_thread.join()
move.success = (mrt.src_success and mrt.dest_success)
if mrt.src_error_message or mrt.dest_error_message:
--
1.7.0.4
