Browse Source

Merge "Respect isolcpus kernel_args" into stable/train

changes/24/825024/1
Zuul 5 months ago committed by Gerrit Code Review
parent
commit
dd8bcbc54c
  1. 5
      paunch/builder/podman.py

5
paunch/builder/podman.py

@ -94,14 +94,13 @@ 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':
# 'all' is a special value to directly configure all CPUs
# that are available. Without specifying --cpuset-cpus, we'll
# let the container engine to figure out what CPUs are online.
# https://bugs.launchpad.net/tripleo/+bug/1868135
# 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:
with open('/proc/cmdline') as cmdline:
if 'isolcpus' in cmdline.read():

Loading…
Cancel
Save