adjusting condition for downloading private image

1 files changed, 6 insertions, 5 deletions

diff --git a/glance-gateway.py b/glance-gateway.py
index 21806c4..89ae49c 100755
--- a/glance-gateway.py
+++ b/glance-gateway.py
@@ -25,9 +25,9 @@ def read_manifests(env):
     return manifests
 
 
-def check_image_exists_up2date(glance, manifest):
-    image = glance.find("%s.%s" % (manifest["image_name"], manifest["image_type"]))
-    return image and str(manifest["tag"]) in image.tags
+# def check_image_exists_up2date(glance, manifest):
+#     image = glance.find("%s.%s" % (manifest["image_name"], manifest["image_type"]))
+#     return image and str(manifest["tag"]) in image.tags
 
 
 def main(args):
@@ -51,7 +51,7 @@ def main(args):
     keystone_src = Keystone(env_src)
     glance_src = Glance(keystone_src, endpoint_type="publicURL")
     for image_name, manifest in manifests.items():
-        if manifest["vetted"] and not check_image_exists_up2date(glance_src, manifest):
+        if manifest["vetted"]:
             # 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"]))
@@ -61,7 +61,8 @@ def main(args):
                                        username=env_src.extra_envs["openbook_user"],
                                        password=env_src.extra_envs["openbook_pass"])
             for region in [region for region in ob_client.get_service_managers()
-                        if region["name"] not in manifest["regions_to_exclude"]]:
+                        if manifest["regions_to_exclude"]] is None or
+                            region["name"] not in manifest["regions_to_exclude"]]:
                 # upload image as public
                 env_dest = Environment(region["connectionUrl"],
                                        args.os_project_name,