From d1e7b451acb04f7c69fdc14301ad971fd2b385a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Paulo=20Barraca?= Date: Wed, 2 Jul 2014 16:36:05 +0100 Subject: [PATCH 1/2] Added proper support for Reboot --- novadocker/virt/docker/driver.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/novadocker/virt/docker/driver.py b/novadocker/virt/docker/driver.py index 66cc650dd4..57819fc9b4 100644 --- a/novadocker/virt/docker/driver.py +++ b/novadocker/virt/docker/driver.py @@ -335,12 +335,9 @@ def reboot(self, context, instance, network_info, reboot_type, container_id = self._find_container_by_name(instance['name']).get('id') if not container_id: return - if not self.docker.stop_container(container_id): - LOG.warning(_('Cannot stop the container, ' - 'please check docker logs')) - if not self.docker.start_container(container_id): - LOG.warning(_('Cannot restart the container, ' - 'please check docker logs')) + + self.power_off(instance) + self.power_on(context, instance, network_info, block_device_info) def power_on(self, context, instance, network_info, block_device_info): container_id = self._find_container_by_name(instance['name']).get('id') @@ -356,12 +353,15 @@ def power_on(self, context, instance, network_info, block_device_info): raise exception.InstanceDeployFailure(msg.format(e), instance_id=instance['name']) - def power_off(self, instance): + def power_off(self, instance, network_info=None): container_id = self._find_container_by_name(instance['name']).get('id') if not container_id: return self.docker.stop_container(container_id) + if network_info: + self.unplug_vifs(instance, network_info) + def pause(self, instance): """Pause the specified instance. @@ -440,3 +440,4 @@ def _create_container(self, instance, args): def get_host_uptime(self, host): return hostutils.sys_uptime() + From a61947403a3ada4d2fcea29f9fa3abbb49013743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Paulo=20Barraca?= Date: Wed, 2 Jul 2014 16:36:58 +0100 Subject: [PATCH 2/2] Removed extra line --- novadocker/virt/docker/driver.py | 1 - 1 file changed, 1 deletion(-) diff --git a/novadocker/virt/docker/driver.py b/novadocker/virt/docker/driver.py index 57819fc9b4..90ebff5da8 100644 --- a/novadocker/virt/docker/driver.py +++ b/novadocker/virt/docker/driver.py @@ -440,4 +440,3 @@ def _create_container(self, instance, args): def get_host_uptime(self, host): return hostutils.sys_uptime() -