Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update ODL tag to release/carbon"
[functest.git]
/
functest
/
utils
/
openstack_clean.py
diff --git
a/functest/utils/openstack_clean.py
b/functest/utils/openstack_clean.py
old mode 100755
(executable)
new mode 100644
(file)
index
e88245d
..
d7df8f8
--- a/
functest/utils/openstack_clean.py
+++ b/
functest/utils/openstack_clean.py
@@
-23,7
+23,6
@@
#
import logging
#
import logging
-import sys
import time
import yaml
import time
import yaml
@@
-382,6
+381,7
@@
def remove_tenants(keystone_client, default_tenants):
def main():
def main():
+ logging.basicConfig()
logger.info("Cleaning OpenStack resources...")
nova_client = os_utils.get_nova_client()
logger.info("Cleaning OpenStack resources...")
nova_client = os_utils.get_nova_client()
@@
-430,8
+430,3
@@
def main():
remove_tenants(keystone_client, default_tenants)
separator()
return 0
remove_tenants(keystone_client, default_tenants)
separator()
return 0
-
-
-if __name__ == '__main__':
- logging.basicConfig()
- sys.exit(main())