From e26b09491e1892058f4580e50042b2f4e2d51d43 Mon Sep 17 00:00:00 2001
From: "Dave Walker (Daviey)" <email@daviey.com>
Date: Mon, 8 Jun 2015 17:10:10 +0100
Subject: [PATCH] Removed a non-conditional 'if' statement

In a recent refactor of the libvirt driver an 'if'
statement was left remaining which was no longer
conditional as the variable is now a constant.

This removes the exuberant 'if' statement.

Change-Id: Ie3545554859e2a0fc4b294f4f464dd9bdd9f93c5
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
---
 nova/virt/libvirt/host.py | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/nova/virt/libvirt/host.py b/nova/virt/libvirt/host.py
index 4bae94caa7fc..2a4b0e8e242e 100644
--- a/nova/virt/libvirt/host.py
+++ b/nova/virt/libvirt/host.py
@@ -392,25 +392,22 @@ class Host(object):
             event = args[0]
             self._events_delayed.pop(event.uuid, None)
 
-        if self._lifecycle_delay > 0:
-            # Cleanup possible delayed stop events.
-            if event.uuid in self._events_delayed.keys():
-                self._events_delayed[event.uuid].cancel()
-                self._events_delayed.pop(event.uuid, None)
-                LOG.debug("Removed pending event for %s due to "
-                          "lifecycle event", event.uuid)
+        # Cleanup possible delayed stop events.
+        if event.uuid in self._events_delayed.keys():
+            self._events_delayed[event.uuid].cancel()
+            self._events_delayed.pop(event.uuid, None)
+            LOG.debug("Removed pending event for %s due to "
+                      "lifecycle event", event.uuid)
 
-            if event.transition == virtevent.EVENT_LIFECYCLE_STOPPED:
-                # Delay STOPPED event, as they may be followed by a STARTED
-                # event in case the instance is rebooting
-                id_ = greenthread.spawn_after(self._lifecycle_delay,
-                                              self._event_emit, event)
-                self._events_delayed[event.uuid] = id_
-                # add callback to cleanup self._events_delayed dict after
-                # event was called
-                id_.link(event_cleanup, event)
-            else:
-                self._event_emit(event)
+        if event.transition == virtevent.EVENT_LIFECYCLE_STOPPED:
+            # Delay STOPPED event, as they may be followed by a STARTED
+            # event in case the instance is rebooting
+            id_ = greenthread.spawn_after(self._lifecycle_delay,
+                                          self._event_emit, event)
+            self._events_delayed[event.uuid] = id_
+            # add callback to cleanup self._events_delayed dict after
+            # event was called
+            id_.link(event_cleanup, event)
         else:
             self._event_emit(event)