Merge "Updating settings description" into stable/train

deployment/nova/nova-compute-container-puppet.yaml

@@ -345,8 +345,9 @@ parameters:
     default: true
     type: boolean
   NovaLiveMigrationPermitPostCopy:
-    description: Wether to switch the VM active on destination node before migration is complete,
-                 therefore ensuring an upper bound on the memory that needs to be transferred.
+    description: >
+      Set to "True" to activate the instance on the destination node before migration is complete,
+      and to set an upper bound on the memory that needs to be transferred.
     default: ''
     type: string
     constraints:
@@ -354,10 +355,11 @@ parameters:
     tags:
       - role_specific
   NovaLiveMigrationPermitAutoConverge:
-    description: Auto converge will throttles down CPU if a progress of on-going live migration is
-                 slow. Auto converge will only be used if this flag is set to True and post copy is
-                 not permitted or post copy is unavailable due to the version of libvirt and QEMU
-                 in use.
+    description: >
+        Set to "True" to slow down the instance CPU until the memory copy process is faster than the
+        instance's memory writes when the migration performance is slow and might not complete.
+        Auto converge will only be used if this flag is set to True and post copy is not permitted
+        or post copy is unavailable due to the version of libvirt and QEMU.
     default: ''
     type: string
     constraints: