openstack/zun
Code Issues Proposed changes

Merge "Set sandbox id immediately after sandbox create"

Browse Source
This commit is contained in:
Jenkins 2017-06-28 04:45:40 +00:00 committed by Gerrit Code Review
commit 034b99f6fc
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zun/compute/manager.py
View File

@ -104,7 +104,6 @@ class Manager(object):
self._fail_container(context, container, six.text_type(e))
return
self.driver.set_sandbox_id(container, sandbox_id)
container.task_state = consts.IMAGE_PULLING
container.save(context)
repo, tag = utils.parse_image_name(container.image)

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

@ -543,6 +543,7 @@ class DockerDriver(driver.ContainerDriver):
name = self.get_sandbox_name(container)
sandbox = docker.create_container(image, name=name,
hostname=name[:63])
self.set_sandbox_id(container, sandbox['Id'])
security_group_ids = None
if container.security_groups is not None:
security_group_ids = self._get_security_group_ids(