openstack/zun
Code Issues Proposed changes

Merge "Fix option conflict in Zun CNI for recent Docker"

Browse Source
This commit is contained in:
Zuul 2025-02-12 07:00:34 +00:00 committed by Gerrit Code Review
commit 37ad1eb9d1
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zun/network/cni_network.py
View File

@ -110,7 +110,6 @@ class ZunCNI(network.Network):
container.save(self.context) container.save(self.context)
host_config['network_mode'] = 'none' host_config['network_mode'] = 'none'
container_kwargs['mac_address'] = port['mac_address']
# We manipulate entrypoint and command parameters in here. # We manipulate entrypoint and command parameters in here.
token = (container.entrypoint or []) + (container.command or []) token = (container.entrypoint or []) + (container.command or [])