openstack/zun
Code Issues Proposed changes

Merge "Avoid creating port without security groups"

Browse Source
This commit is contained in:
Jenkins 2017-06-04 15:34:29 +00:00 committed by Gerrit Code Review
commit 8c47c12134
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zun/container/docker/driver.py
View File

@ -542,9 +542,10 @@ class DockerDriver(driver.ContainerDriver):
name = self.get_sandbox_name(container)
sandbox = docker.create_container(image, name=name,
hostname=name[:63])
security_groups = container.security_groups or None
security_group_ids = self._get_security_group_ids(
context, security_groups)
security_group_ids = None
if container.security_groups is not None:
security_group_ids = self._get_security_group_ids(
context, container.security_groups)
# Container connects to the bridge network by default so disconnect
# the container from it before connecting it to neutron network.
# This avoids potential conflict between these two networks.

8
zun/network/kuryr_network.py
View File

@ -121,11 +121,13 @@ class KuryrNetwork(network.Network):
"""
network = self.inspect_network(network_name)
neutron_net_id = network['Options']['neutron.net.uuid']
neutron_port = self.neutron.create_port({'port': {
port_dict = {
'network_id': neutron_net_id,
'security_groups': security_group_ids,
'tenant_id': self.context.project_id
}})
}
if security_group_ids is not None:
port_dict['security_groups'] = security_group_ids
neutron_port = self.neutron.create_port({'port': port_dict})
ipv4_address = None
ipv6_address = None