Browse Source

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

tags/8.4.1
Zuul 2 months ago
parent
commit
5ebb18af26
1 changed files with 19 additions and 1 deletions
  1. 19
    1
      docker/services/nova-conductor.yaml

+ 19
- 1
docker/services/nova-conductor.yaml View File

@@ -44,7 +44,12 @@ parameters:
44 44
     default: false
45 45
     description: Remove package if the service is being disabled during upgrade
46 46
     type: boolean
47
-
47
+  NovaEnableNUMALiveMigration:
48
+    default: false
49
+    description: Whether to enable or not the live migration for NUMA topology instances.
50
+    type: boolean
51
+    tags:
52
+      - role_specific
48 53
 
49 54
 resources:
50 55
 
@@ -70,6 +75,18 @@ resources:
70 75
       DockerNovaImage: {get_param: DockerNovaConductorImage}
71 76
       NovaServiceName: 'conductor'
72 77
 
78
+  RoleParametersValue:
79
+    type: OS::Heat::Value
80
+    properties:
81
+      type: json
82
+      value:
83
+        map_replace:
84
+          - map_replace:
85
+            - nova::workarounds::enable_numa_live_migration: NovaEnableNUMALiveMigration
86
+            - values: {get_param: [RoleParameters]}
87
+          - values:
88
+              NovaEnableNUMALiveMigration: {get_param: NovaEnableNUMALiveMigration}
89
+
73 90
 outputs:
74 91
   role_data:
75 92
     description: Role data for the Nova Conductor service.
@@ -79,6 +96,7 @@ outputs:
79 96
         map_merge:
80 97
           - {get_attr: [NovaConductorBase, role_data, config_settings]}
81 98
           - {get_attr: [NovaLogging, config_settings]}
99
+          - {get_attr: [RoleParametersValue, value]}
82 100
       logging_source: {get_attr: [NovaConductorBase, role_data, logging_source]}
83 101
       logging_groups: {get_attr: [NovaConductorBase, role_data, logging_groups]}
84 102
       service_config_settings: {get_attr: [NovaConductorBase, role_data, service_config_settings]}

Loading…
Cancel
Save