Merge branch 'stable-2.9' into stable-2.10

[ganeti-local] / UPGRADE

diff --git a/UPGRADE b/UPGRADE
index 3fbc7da..aef642c 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -42,6 +42,10 @@ To run commands on all nodes, the `distributed shell (dsh)
 
     $ tar czf /var/lib/ganeti-$(date +\%FT\%T).tar.gz -C /var/lib ganeti
 
+    (``/var/lib/ganeti`` can also contain exported instances, so make sure to
+    backup only files you are interested in. Use ``--exclude export`` for
+    example)
+
 #. Install new Ganeti version on all nodes
 #. Run cfgupgrade on the master node::
 
@@ -60,6 +64,9 @@ To run commands on all nodes, the `distributed shell (dsh)
 
     $ /usr/lib/ganeti/tools/users-setup
 
+   This will ask for confirmation. To execute directly, add the ``--yes-do-it``
+   option.
+
 #. Restart daemons on all nodes::
 
     $ /etc/init.d/ganeti restart