openstack/zun
Code Issues Proposed changes

Merge "Remove network_standalone variable"

Browse Source
This commit is contained in:
Zuul 2017-10-25 03:04:43 +00:00 committed by Gerrit Code Review
commit f95a34a9af
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,16 +114,13 @@ class DockerDriver(driver.ContainerDriver):
def create(self, context, container, image, requested_networks): def create(self, context, container, image, requested_networks):
sandbox_id = container.get_sandbox_id() sandbox_id = container.get_sandbox_id()
network_standalone = False if sandbox_id else True
with docker_utils.docker_client() as docker: with docker_utils.docker_client() as docker:
network_api = zun_network.api(context=context, docker_api=docker) network_api = zun_network.api(context=context, docker_api=docker)
name = container.name name = container.name
LOG.debug('Creating container with image %(image)s name %(name)s', LOG.debug('Creating container with image %(image)s name %(name)s',
{'image': image['image'], 'name': name}) {'image': image['image'], 'name': name})
if network_standalone: self._provision_network(context, network_api, requested_networks)
self._provision_network(context, network_api,
requested_networks)
kwargs = { kwargs = {
'name': self.get_container_name(container), 'name': self.get_container_name(container),
'command': container.command, 'command': container.command,
@ -167,7 +164,7 @@ class DockerDriver(driver.ContainerDriver):
response = docker.create_container(image_repo, **kwargs) response = docker.create_container(image_repo, **kwargs)
container.container_id = response['Id'] container.container_id = response['Id']
if network_standalone: if not container.addresses:
addresses = self._setup_network_for_container( addresses = self._setup_network_for_container(
context, container, requested_networks, network_api) context, container, requested_networks, network_api)
container.addresses = addresses container.addresses = addresses