Merge "Drop NovaEnableNumaLiveMigration"

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

@@ -52,12 +52,6 @@ parameters:
     description: The password for the nova service and db account
     type: string
     hidden: true
-  NovaEnableNUMALiveMigration:
-    default: false
-    description: Whether to enable or not the live migration for NUMA topology instances.
-    type: boolean
-    tags:
-      - role_specific
 
 conditions:
   nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
@@ -86,18 +80,6 @@ resources:
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
 
-  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.
@@ -108,7 +90,6 @@ outputs:
         map_merge:
           - {get_attr: [NovaBase, role_data, config_settings]}
           - {get_attr: [NovaLogging, config_settings]}
-          - {get_attr: [RoleParametersValue, value]}
           -
             if:
             - nova_workers_zero

releasenotes/notes/deprecate-nova-enable-numa-live-migration-5e0601c7d26a8f3c.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    NovaEnableNUMALiveMigration was removed and has no effect, becuase the
+    corresponding parameter in nova was deprecated in Train release.