openstack
/
paunch
Code Issues Proposed changes

Merge "Respect isolcpus kernel_args" into stable/train

This commit is contained in:
Zuul 2021-12-21 03:53:12 +00:00 committed by Gerrit Code Review
parent 5a12a07b1a 200d4dae2a
commit dd8bcbc54c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
paunch/builder/podman.py
View File

@ -94,14 +94,13 @@ class PodmanBuilder(base.BaseBuilder):
for extra_host in cconfig.get('extra_hosts', []): for extra_host in cconfig.get('extra_hosts', []):
if extra_host: if extra_host:
cmd.append('--add-host=%s' % extra_host) cmd.append('--add-host=%s' % extra_host)
if 'cpuset_cpus' in cconfig: if 'cpuset_cpus' in cconfig and cconfig['cpuset_cpus'] != 'all':
# 'all' is a special value to directly configure all CPUs # 'all' is a special value to directly configure all CPUs
# that are available. Without specifying --cpuset-cpus, we'll # that are available. Without specifying --cpuset-cpus, we'll
# let the container engine to figure out what CPUs are online. # let the container engine to figure out what CPUs are online.
# https://bugs.launchpad.net/tripleo/+bug/1868135 # https://bugs.launchpad.net/tripleo/+bug/1868135
# https://bugzilla.redhat.com/show_bug.cgi?id=1813091 # https://bugzilla.redhat.com/show_bug.cgi?id=1813091
if cconfig['cpuset_cpus'] != 'all': cmd.append('--cpuset-cpus=%s' % cconfig['cpuset_cpus'])
cmd.append('--cpuset-cpus=%s' % cconfig['cpuset_cpus'])
else: else:
with open('/proc/cmdline') as cmdline: with open('/proc/cmdline') as cmdline:
if 'isolcpus' in cmdline.read(): if 'isolcpus' in cmdline.read():