Back to the old expunge logic

The expunge interval and delay are respected and no additional delays
are introduced.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

test/integration/smoke/test_vm_life_cycle.py

@@ -854,9 +854,6 @@ def test_09_expunge_vm(self):
                                      )
 
         expunge_delay = int(config[0].value)
-        if expunge_delay < 600:
-            expunge_delay = 600
-        # Wait for some time more than expunge.delay
         time.sleep(expunge_delay * 2)
 
         #VM should be destroyed unless expunge thread hasn't run
@@ -866,9 +863,6 @@ def test_09_expunge_vm(self):
                                      name='expunge.interval'
                                      )
         expunge_cycle = int(config[0].value)
-        if expunge_cycle < 600:
-            expunge_cycle = 600
-
         wait_time = expunge_cycle * 2
         while wait_time >= 0:
             list_vm_response = list_virtual_machines(