Merge "live_migration setting should be under libvirt namespace" into…

… stable/ussuri

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

@@ -847,7 +847,7 @@ outputs:
             nova::compute::instance_usage_audit_period: 'hour'
             nova::compute::consecutive_build_service_disable_threshold: {get_param: NovaAutoDisabling}
             nova::compute::live_migration_wait_for_vif_plug: {get_param: NovaLiveMigrationWaitForVIFPlug}
-            nova::migration::live_migration_permit_post_copy:
+            nova::migration::libvirt::live_migration_permit_post_copy:
               if:
                 - permit_post_copy_set
                 - contains:
@@ -857,7 +857,7 @@ outputs:
                   - reserved_huge_pages_set
                   - true
                   - false
-            nova::migration::live_migration_permit_auto_converge:
+            nova::migration::libvirt::live_migration_permit_auto_converge:
               if:
                 - permit_auto_converge_set
                 - contains:
@@ -875,7 +875,7 @@ outputs:
             # In future versions of QEMU (2.6, mostly), danpb's native
             # encryption work will obsolete the need to use TUNNELLED transport
             # mode.
-            nova::migration::live_migration_tunnelled:
+            nova::migration::libvirt::live_migration_tunnelled:
               if:
               - enable_live_migration_tunnelled
               - true