Переглянути джерело

Added support for service creds to be loaded from env var

Nuwan Goonasekera 8 роки тому
батько
коміт
bf7088978a
1 змінених файлів з 2 додано та 1 видалено
  1. 2 1
      cloudbridge/cloud/providers/gce/provider.py

+ 2 - 1
cloudbridge/cloud/providers/gce/provider.py

@@ -141,7 +141,8 @@ class GCECloudProvider(BaseCloudProvider):
         self.credentials_file = self._get_config_value(
         self.credentials_file = self._get_config_value(
             'gce_service_creds_file', os.environ.get('GCE_SERVICE_CREDS_FILE'))
             'gce_service_creds_file', os.environ.get('GCE_SERVICE_CREDS_FILE'))
         self.credentials_dict = self._get_config_value(
         self.credentials_dict = self._get_config_value(
-            'gce_service_creds_dict', {})
+            'gce_service_creds_dict',
+            json.loads(os.environ.get('GCE_SERVICE_CREDS_DICT') or {}))
         # If 'gce_service_creds_dict' is not passed in from config and
         # If 'gce_service_creds_dict' is not passed in from config and
         # self.credentials_file is available, read and parse the json file to
         # self.credentials_file is available, read and parse the json file to
         # self.credentials_dict.
         # self.credentials_dict.