Merge "Fail to live migration if instance has NUMA topology" into stable/queens

docker/services/nova-conductor.yaml

@@ -44,7 +44,12 @@ parameters:
     default: false
     description: Remove package if the service is being disabled during upgrade
     type: boolean
-
+  NovaEnableNUMALiveMigration:
+    default: false
+    description: Whether to enable or not the live migration for NUMA topology instances.
+    type: boolean
+    tags:
+      - role_specific
 
 resources:
 
@@ -70,6 +75,18 @@ resources:
       DockerNovaImage: {get_param: DockerNovaConductorImage}
       NovaServiceName: 'conductor'
 
+  RoleParametersValue:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        map_replace:
+          - map_replace:
+            - nova::workarounds::enable_numa_live_migration: NovaEnableNUMALiveMigration
+            - values: {get_param: [RoleParameters]}
+          - values:
+              NovaEnableNUMALiveMigration: {get_param: NovaEnableNUMALiveMigration}
+
 outputs:
   role_data:
     description: Role data for the Nova Conductor service.
@@ -79,6 +96,7 @@ outputs:
         map_merge:
           - {get_attr: [NovaConductorBase, role_data, config_settings]}
           - {get_attr: [NovaLogging, config_settings]}
+          - {get_attr: [RoleParametersValue, value]}
       logging_source: {get_attr: [NovaConductorBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaConductorBase, role_data, logging_groups]}
       service_config_settings: {get_attr: [NovaConductorBase, role_data, service_config_settings]}