From 91a30e59e4606fde6cc9aece0e45b8f57b4bb7a3 Mon Sep 17 00:00:00 2001 From: Tom Melendez Date: Fri, 16 Sep 2016 07:02:18 -0700 Subject: [PATCH] Changes to enable make gce to run. Added sys import so libcloud error is displayed; renamed credentials keys in template file so they work properly with gce_credentials.py. (#16607) --- test/integration/credentials.template | 6 +++--- test/integration/gce_credentials.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integration/credentials.template b/test/integration/credentials.template index bbf7c9ba6ea..4e2d3afcd68 100644 --- a/test/integration/credentials.template +++ b/test/integration/credentials.template @@ -9,9 +9,9 @@ ec2_access_key: ec2_secret_key: # GCE Credentials -service_account_email: -pem_file: -project_id: +gce_service_account_email: +gce_pem_file: +gce_project_id: # Azure Credentials azure_subscription_id: "{{ lookup('env', 'AZURE_SUBSCRIPTION_ID') }}" diff --git a/test/integration/gce_credentials.py b/test/integration/gce_credentials.py index 0d7ae81cae4..e474bf0307e 100644 --- a/test/integration/gce_credentials.py +++ b/test/integration/gce_credentials.py @@ -1,5 +1,6 @@ import collections import os +import sys import yaml try: