commit 8cadfe3f8030658cf85682779b9697189c9999ec
author Jenkins <jenkins@review.openstack.org> Tue Feb 23 12:38:09 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Feb 23 12:38:09 2016 +0000
tree 8e261fde4d0332116131e5c148c87b312ba294ff
parent 6a90e2e726954612a971fe669afb4d514e56a31a
parent 41711d3ceeb7d93b3cbe0da86830c3252e03ba21

Merge "Fix cleanup command"

tempest/cmd/cleanup.py

diff --git a/tempest/cmd/cleanup.py b/tempest/cmd/cleanup.py
index c8a8159..5a52043 100644
--- a/tempest/cmd/cleanup.py
+++ b/tempest/cmd/cleanup.py
@@ -77,7 +77,8 @@
     def take_action(self, parsed_args):
         try:
             self.init(parsed_args)
-            self._cleanup()
+            if not parsed_args.init_saved_state:
+                self._cleanup()
         except Exception:
             LOG.exception("Failure during cleanup")
             traceback.print_exc()

tempest/cmd/cleanup_service.py

diff --git a/tempest/cmd/cleanup_service.py b/tempest/cmd/cleanup_service.py
index 33f19b1..5ec8008 100644
--- a/tempest/cmd/cleanup_service.py
+++ b/tempest/cmd/cleanup_service.py
@@ -78,7 +78,7 @@
 
     if IS_NEUTRON:
         CONF_PRIV_NETWORK = _get_network_id(CONF.compute.fixed_network_name,
-                                            CONF.identity.tenant_name)
+                                            CONF.auth.admin_tenant_name)
         CONF_NETWORKS = [CONF_PUB_NETWORK, CONF_PRIV_NETWORK]