From 4b66bf34d9543120e29d89105b51bb0493d28ce7 Mon Sep 17 00:00:00 2001
From: ahothan <ahothan@cisco.com>
Date: Fri, 26 May 2017 08:07:30 -0700
Subject: [PATCH] Fix credentials for force_cleanup, fix issue loading openrc
 variables from env with identity API v2

Change-Id: Ie97dac1ebd97f6f9ec90f04f75c2e88937c45678
---
 kloudbuster/credentials.py   | 4 ++--
 kloudbuster/force_cleanup.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kloudbuster/credentials.py b/kloudbuster/credentials.py
index e136c90..8c8cccd 100644
--- a/kloudbuster/credentials.py
+++ b/kloudbuster/credentials.py
@@ -96,7 +96,7 @@ class Credentials(object):
     # Read a openrc file and take care of the password
     # The 2 args are passed from the command line and can be None
     #
-    def __init__(self, openrc_file, pwd, no_env):
+    def __init__(self, openrc_file, pwd=None, no_env=False):
         self.rc_password = None
         self.rc_username = None
         self.rc_tenant_name = None
@@ -106,7 +106,7 @@ class Credentials(object):
         self.rc_user_domain_name = None
         self.rc_project_domain_name = None
         self.rc_project_name = None
-        self.rc_identity_api_version = '2'
+        self.rc_identity_api_version = 2
         success = True
 
         if openrc_file:
diff --git a/kloudbuster/force_cleanup.py b/kloudbuster/force_cleanup.py
index 2afc657..070e494 100755
--- a/kloudbuster/force_cleanup.py
+++ b/kloudbuster/force_cleanup.py
@@ -53,6 +53,7 @@ import argparse
 import re
 import sys
 import time
+import traceback
 
 # openstack python clients
 import cinderclient
@@ -81,6 +82,7 @@ def fetch_resources(fetcher, options=None):
             res_list = fetcher()
     except Exception as e:
         res_list = []
+        traceback.print_exc()
         print "Warning exception while listing resources:" + str(e)
     resources = {}
     for res in res_list:
@@ -468,8 +470,7 @@ class KbCleaners(object):
 
     def __init__(self, creds_obj, resources, dryrun):
         self.cleaners = []
-        creds = creds_obj.get_credentials()
-        sess = creds.get_session()
+        sess = creds_obj.get_session()
         for cleaner_type in [StorageCleaner, ComputeCleaner, NetworkCleaner, KeystoneCleaner]:
             self.cleaners.append(cleaner_type(sess, resources, dryrun))