Trivial fix on migration doc

This patch does the following:
1. Mention that the current doc is only relavant to cold-migration.
2. Additional live-migration reference is given.
3. The inappropriate --live flag in the example is removed.
4. Policy violation message is updated.
5. Replace a nova command with openstack commmand

Change-Id: Idaa7915ea47d11e30da3f12318082a10a4e73b3b

1 files changed, 8 insertions, 3 deletions

diff --git a/doc/source/admin/migration.rst b/doc/source/admin/migration.rst
index 613462c998..3020825e89 100644
--- a/doc/source/admin/migration.rst
+++ b/doc/source/admin/migration.rst
@@ -2,6 +2,11 @@
 Migrate instances
 =================
 
+.. note::
+
+   This documentation is about cold-migration. For live-migration usage, see
+   :doc:`live-migration-usage`.
+
 When you want to move an instance from one compute host to another, you can use
 the :command:`openstack server migrate` command. The scheduler chooses the
 destination compute host based on its settings. This process does not assume
@@ -20,7 +25,7 @@ nodes. For more information, see :ref:`cli-os-migrate-cfg-ssh`.
 
    .. code-block:: console
 
-      $ openstack server migrate --live TARGET_HOST VM_INSTANCE
+      $ openstack server migrate VM_INSTANCE
 
 #. To migrate an instance and watch the status, use this example script:
 
@@ -48,7 +53,7 @@ nodes. For more information, see :ref:`cli-os-migrate-cfg-ssh`.
       VM_OUTPUT=$(openstack server show $VM_ID)
       VM_STATUS=$(echo "$VM_OUTPUT" | grep status | awk '{print $4}')
       done
-      nova resize-confirm $VM_ID
+      openstack server resize --confirm $VM_ID
       echo " instance migrated and resized."
       echo;
 
@@ -65,7 +70,7 @@ nodes. For more information, see :ref:`cli-os-migrate-cfg-ssh`.
    with the wrong credentials, such as a non-admin user, or the ``policy.json``
    file prevents migration for your user::
 
-     ERROR (Forbidden): Policy doesn't allow compute_extension:admin_actions:migrate to be performed. (HTTP 403)``
+     Policy doesn't allow os_compute_api:os-migrate-server:migrate to be performed. (HTTP 403)
 
 .. note::