summaryrefslogtreecommitdiff
path: root/glance-gateway.py
diff options
context:
space:
mode:
authorCarlos Konstanski <ckonstanski@pippiandcarlos.com>2018-01-04 13:14:39 -0700
committerCarlos Konstanski <ckonstanski@pippiandcarlos.com>2018-01-04 13:14:39 -0700
commit868fca17bfcc30d60f2fc135db54cac11e171000 (patch)
treed791b85de5354eced01d723136e1ceb866f059c0 /glance-gateway.py
parent99eb920ce765b3c18bac39cf1215c8f4ab5cd426 (diff)
Alternate region handling for non-VZW environmentsHEADmaster
Diffstat (limited to 'glance-gateway.py')
-rwxr-xr-xglance-gateway.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/glance-gateway.py b/glance-gateway.py
index 8928e2b..1d85972 100755
--- a/glance-gateway.py
+++ b/glance-gateway.py
@@ -56,8 +56,11 @@ def main(args):
# download private image to /tmp
glance_src.download("%s.%s.unvetted" % (manifest["image_name"], manifest["image_type"]),
"/tmp/%s.%s" % (manifest["image_name"], manifest["image_type"]))
- service_status_client = ServiceStatusClient(host=env_src.extra_envs["service_status_host"])
- regions = service_status_client.get_service_managers()
+ try:
+ service_status_client = ServiceStatusClient(host=env_src.extra_envs["service_status_host"])
+ regions = service_status_client.get_service_managers()
+ except Exception as e:
+ regions = []
if manifest["regions_to_exclude"] is None and manifest["regions_to_include"] is None:
regions_filtered = regions
elif manifest["regions_to_exclude"] is not None and manifest["regions_to_include"] is None: