From cb9854c701ab631628902ae1e9d9e76f0e2785b0 Mon Sep 17 00:00:00 2001 From: Zhipeng Liu Date: Thu, 24 Dec 2020 22:21:41 +0800 Subject: [PATCH] Update cpu_shared_set and cpu_dedicated_set in nova config Starting from Ussuri, OpenStack is deprecating vcpu_pin_set in favor of cpu_dedicated_set and cpu_shared_set. These overriders must be supported to be generated via Starlingx system commands. Closes-Bug: 1904729 Change-Id: I61514389b616db754b0d2f35deb0101f90dbdd02 Signed-off-by: Zhipeng Liu --- .../k8sapp_openstack/k8sapp_openstack/helm/nova.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py index 75e34d04..fb39d4fe 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py @@ -267,7 +267,13 @@ class NovaHelm(openstack.OpenstackBaseHelm): host, function=constants.APPLICATION_FUNCTION, threads=True) vm_cpu_list = [c.cpu for c in vm_cpus] vm_cpu_fmt = "\"%s\"" % utils.format_range_set(vm_cpu_list) - default_config.update({'vcpu_pin_set': vm_cpu_fmt}) + default_config.update({'cpu_shared_set': vm_cpu_fmt}) + + isol_cpus = self._get_host_cpu_list( + host, function=constants.ISOLATED_FUNCTION, threads=True) + isol_cpu_list = [c.cpu for c in isol_cpus] + isol_cpu_fmt = "\"%s\"" % utils.format_range_set(isol_cpu_list) + default_config.update({'cpu_dedicated_set': vm_cpu_fmt}) shared_cpus = self._get_host_cpu_list( host, function=constants.SHARED_FUNCTION, threads=True)