export/import actually works

howto/ganeti.md

@@ -2133,17 +2133,28 @@ evacuated.
         gnt-backup export -n fsn-node-01.torproject.org test-01.torproject.org
 
     WARNING: this step is currently not working if there's a second
-    disk (or swap device? to be confirmed), see
-    https://github.com/ganeti/instance-debootstrap/issues/18
+    disk (or swap device? to be confirmed), see [this upstream issue
+    for details](https://github.com/ganeti/instance-debootstrap/issues/18). for now we're deploying the "nocloud"
+    export/import mechanisms through Puppet to workaround that problem
+    which means the whole disk is copied (as opposed to only the used
+    parts)
 
  4. copy the VM snapshot from the source node to node in the target
     cluster:
 
-        rsync -a /var/lib/ganeti/export/test-01.torproject.org/ root@chi-node-02.torproject.org:/srv/ganeti/test-01.torproject.org/
+        rsync -a /var/lib/ganeti/export/test-01.torproject.org/ root@chi-node-02.torproject.org:/var/lib/ganeti/export/test-01.torproject.org/
 
  5. on the master of the target Ganeti cluster, import the VM:
 
-        gnt-backup import -n chi-node-08.torproject.org --src-node=chi-node-02.torproject.org --src-dir=/srv/ganeti/??? test-01.torproject.org
+        gnt-backup import -n chi-node-08:chi-node-07 --src-node=chi-node-02.torproject.org --src-dir=/var/lib/ganeti/export/test-01.torproject.org/ test-01.torproject.org
+
+ 6. enter the restored server console to change the IP address:
+ 
+        gnt-instance console test-01.torproject.org
+        
+ 7. if everything looks well, change the IP in LDAP
+
+ 8. destroy the old VM
 
 ### Mass migrating instances to a new cluster