Delete lxd container in state stopped (#2885)

If a lxd container is stopped, do not stop it before deleting it.
This commit is contained in:
Nils Pascal Illenseer 2016-09-09 14:57:36 +02:00 committed by René Moser
parent f83aa9fff3
commit 6c6da8f86e

View file

@ -364,7 +364,7 @@ class LXDContainerManagement(object):
self.actions.append('restart') self.actions.append('restart')
def _delete_container(self): def _delete_container(self):
return self.client.do('DELETE', '/1.0/containers/{0}'.format(self.name)) self.client.do('DELETE', '/1.0/containers/{0}'.format(self.name))
self.actions.append('delete') self.actions.append('delete')
def _freeze_container(self): def _freeze_container(self):
@ -446,7 +446,8 @@ class LXDContainerManagement(object):
if self.old_state != 'absent': if self.old_state != 'absent':
if self.old_state == 'frozen': if self.old_state == 'frozen':
self._unfreeze_container() self._unfreeze_container()
self._stop_container() if self.old_state != 'stopped':
self._stop_container()
self._delete_container() self._delete_container()
def _frozen(self): def _frozen(self):