From 2ecb2ce7d9157f9920deb0baec35dde4a4820a97 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Mon, 11 Sep 2017 22:07:51 +0000 Subject: [PATCH] Remove network_standalone variable This is a minor refactoring of the driver code. The variable network_standalone is used for testing if the driver should provision and setup the network. However, it is possible to achieve the same without using this variable. This patch proposes to remove this variable to make the code look better. Partial-Implements: blueprint direct-cinder-integration Change-Id: Ic8f298c10bd4ed74e04c8ec5c2974abb64b8391d --- zun/container/docker/driver.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/zun/container/docker/driver.py b/zun/container/docker/driver.py index 97db1bb1b..ad996641a 100644 --- a/zun/container/docker/driver.py +++ b/zun/container/docker/driver.py @@ -114,16 +114,13 @@ class DockerDriver(driver.ContainerDriver): def create(self, context, container, image, requested_networks): sandbox_id = container.get_sandbox_id() - network_standalone = False if sandbox_id else True with docker_utils.docker_client() as docker: network_api = zun_network.api(context=context, docker_api=docker) name = container.name LOG.debug('Creating container with image %(image)s name %(name)s', {'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 = { 'name': self.get_container_name(container), 'command': container.command, @@ -167,7 +164,7 @@ class DockerDriver(driver.ContainerDriver): response = docker.create_container(image_repo, **kwargs) container.container_id = response['Id'] - if network_standalone: + if not container.addresses: addresses = self._setup_network_for_container( context, container, requested_networks, network_api) container.addresses = addresses