39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From ba8169f4ef2d715ed681ae38f599aa544fa00023 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Helen Koike <helen.koike@collabora.com>
|
||
|
|
Date: Tue, 1 May 2018 14:01:20 -0300
|
||
|
|
Subject: [PATCH 3/5] fence_gce: fix regression - missing import
|
||
|
|
oauth2client.client
|
||
|
|
|
||
|
|
import oauth2client.client was missing
|
||
|
|
import oauth2client is not necessary
|
||
|
|
Fix wrong path to GoogleCredentials
|
||
|
|
---
|
||
|
|
fence/agents/gce/fence_gce.py | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/fence/agents/gce/fence_gce.py b/fence/agents/gce/fence_gce.py
|
||
|
|
index 04d59846..3a614f14 100644
|
||
|
|
--- a/fence/agents/gce/fence_gce.py
|
||
|
|
+++ b/fence/agents/gce/fence_gce.py
|
||
|
|
@@ -5,7 +5,7 @@ import sys
|
||
|
|
sys.path.append("@FENCEAGENTSLIBDIR@")
|
||
|
|
|
||
|
|
import googleapiclient.discovery
|
||
|
|
-import oauth2client
|
||
|
|
+import oauth2client.client
|
||
|
|
from fencing import fail_usage, run_delay, all_opt, atexit_handler, check_input, process_input, show_docs, fence_action
|
||
|
|
|
||
|
|
def translate_status(instance_status):
|
||
|
|
@@ -99,7 +99,7 @@ def main():
|
||
|
|
run_delay(options)
|
||
|
|
|
||
|
|
try:
|
||
|
|
- credentials = oauth2client.GoogleCredentials.get_application_default()
|
||
|
|
+ credentials = oauth2client.client.GoogleCredentials.get_application_default()
|
||
|
|
conn = googleapiclient.discovery.build('compute', 'v1', credentials=credentials)
|
||
|
|
except Exception as err:
|
||
|
|
fail_usage("Failed: Create GCE compute v1 connection: {}".format(str(err)))
|
||
|
|
--
|
||
|
|
2.16.3
|
||
|
|
|