3 files changed, 3 insertions, 8 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index e41eec6a..64a5ed77 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -423,6 +423,7 @@ def main():
         os.makedirs(TEMPEST_RESULTS_DIR)
 
     deployment_dir = ft_utils.get_deployment_dir(logger)
+    create_tempest_resources()
 
     if "" == args.conf:
         MODE = ""
@@ -430,7 +431,6 @@ def main():
     else:
         MODE = " --tempest-config " + args.conf
 
-    create_tempest_resources()
     generate_test_list(deployment_dir, args.mode)
     apply_tempest_blacklist()
 
diff --git a/testcases/OpenStack/vPing/vping.py b/testcases/OpenStack/vPing/vping.py
index 039e7ec5..168ed4f8 100755
--- a/testcases/OpenStack/vPing/vping.py
+++ b/testcases/OpenStack/vPing/vping.py
@@ -23,8 +23,6 @@ import functest.utils.functest_logger as ft_logger
 import vping_util as util
 
 parser = argparse.ArgumentParser()
-image_exists = False
-
 parser.add_argument("-d", "--debug", help="Debug mode", action="store_true")
 parser.add_argument("-r", "--report",
                     help="Create json result file",
@@ -52,8 +50,7 @@ def main():
     vmname_1 = util.get_vmname_1()
     vmname_2 = util.get_vmname_2()
 
-    global image_exists
-    image_exists, image_id = util.create_image()
+    image_id = util.create_image()
 
     flavor = util.get_flavor()
 
diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py
index d3e081f6..c16c5d65 100644
--- a/testcases/OpenStack/vPing/vping_util.py
+++ b/testcases/OpenStack/vPing/vping_util.py
@@ -153,7 +153,6 @@ def create_image():
     image_id = os_utils.get_image_id(glance_client, GLANCE_IMAGE_NAME)
     if image_id != '':
         logger.info("Using existing image '%s'..." % GLANCE_IMAGE_NAME)
-        image_exists = True
     else:
         logger.info("Creating image '%s' from '%s'..." % (GLANCE_IMAGE_NAME,
                                                           GLANCE_IMAGE_PATH))
@@ -166,9 +165,8 @@ def create_image():
             exit(EXIT_CODE)
         logger.debug("Image '%s' with ID=%s created successfully."
                      % (GLANCE_IMAGE_NAME, image_id))
-        image_exists = True
 
-    return image_exists, image_id
+    return image_id
 
 
 def get_flavor():