openstack
/
paunch
Code Issues Proposed changes

Don't set cpuset_cpus if empty 

If cpuset_cpus is set to '', we don't want to configure it, just skip
it.

Closes-Bug: #1867357
Change-Id: I615c798bdbcc0115f0ca9642969193ceada9b9cd
(cherry picked from commit 7bb9471423)
This commit is contained in:
Emilien Macchi 2020-03-13 11:16:49 -04:00
parent de359d1747
commit 37ac1e99a6
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paunch/builder/compose1.py
View File

@ -82,7 +82,7 @@ class ComposeV1Builder(base.BaseBuilder):
for extra_host in cconfig.get('extra_hosts', []):
if extra_host:
cmd.append('--add-host=%s' % extra_host)
if 'cpuset_cpus' in cconfig:
if 'cpuset_cpus' in cconfig and cconfig['cpuset_cpus'] != '':
# 'all' is a special value to directly configure all CPUs
# that are available.
if cconfig['cpuset_cpus'] == 'all':

2
paunch/builder/podman.py
View File

@ -91,7 +91,7 @@ class PodmanBuilder(base.BaseBuilder):
for extra_host in cconfig.get('extra_hosts', []):
if extra_host:
cmd.append('--add-host=%s' % extra_host)
if 'cpuset_cpus' in cconfig:
if 'cpuset_cpus' in cconfig and cconfig['cpuset_cpus'] != '':
# 'all' is a special value to directly configure all CPUs
# that are available.
if cconfig['cpuset_cpus'] == 'all':

1
paunch/tests/test_builder_base.py
View File

@ -36,6 +36,7 @@ class TestBaseBuilder(base.TestCase):
'one': {
'start_order': 0,
'image': 'centos:7',
'cpuset_cpus': '',
},
'two': {
'start_order': 1,