starlingx
/
config
Code Issues Proposed changes

Fix kubernetes k8s-infra cpuset.cpus mangled values 

The platform kubernetes cgroup configured value for cpuset.cpus
(i.e., /sys/fs/cgroup/cpuset/k8s-infra/cpuset.cpus) is sometimes
incorrect.  The cpulist values are correct in hierdata, but are
mangled when used by puppet.  Solution is to wrap the values in
quotes, like we do for various other parameters.

This bug was introduced by this code:
 https://review.openstack.org/#/c/648511/

Change-Id: Ic49090502242cc1f59dd09afad0db46cc9e399c2
Closes-Bug: 1824563
Signed-off-by: Jim Gauld <james.gauld@windriver.com>
This commit is contained in:
Jim Gauld 2019-04-15 12:12:39 -04:00
parent 7bbe7f1bcd
commit 26b34909d0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysinv/sysinv/sysinv/sysinv/puppet/kubernetes.py
View File

@ -186,8 +186,10 @@ class KubernetesPuppet(base.BasePuppet):
host.hostname, k8s_cpuset, k8s_nodeset)
config.update(
{'platform::kubernetes::params::k8s_cpuset': k8s_cpuset,
'platform::kubernetes::params::k8s_nodeset': k8s_nodeset,
{'platform::kubernetes::params::k8s_cpuset':
"\"%s\"" % k8s_cpuset,
'platform::kubernetes::params::k8s_nodeset':
"\"%s\"" % k8s_nodeset,
})
return config