diff options
| -rwxr-xr-x | glance-gateway.py | 17 | ||||
| -rw-r--r-- | libs/openbook_client.py | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/glance-gateway.py b/glance-gateway.py index f050c2b..aacd6da 100755 --- a/glance-gateway.py +++ b/glance-gateway.py @@ -60,10 +60,10 @@ def main(args): port=env.extra_envs["openbook_port"], username=extra_envs["openbook_user"], password=extra_envs["openbook_pass"]) - for obj in [url for url in ob_client.get_service_managers() - if url not in manifest["regions_to_exclude"]]: + for region in [region for region in ob_client.get_service_managers() + if region["name"] not in manifest["regions_to_exclude"]]: # upload image as public - env_dest = Environment(obj["connectionUrl"], + env_dest = Environment(region["connectionUrl"], args.os_project_name, args.os_region, args.os_username, @@ -81,11 +81,12 @@ def main(args): }) keystone_dest = Keystone(env_dest) glance_dest = Glance(keystone_dest, endpoint_type="publicURL") - glance_dest.upload("%s.%s" % (manifest["image_name"], manifest["image_type"]), - manifest["image_type"], - "/tmp/%s.%s" % (manifest["image_name"], manifest["image_type"]), - "private", - manifest["tag"]) + print("%s.%s" % (manifest["image_name"], manifest["image_type"])) + # glance_dest.upload("%s.%s" % (manifest["image_name"], manifest["image_type"]), + # manifest["image_type"], + # "/tmp/%s.%s" % (manifest["image_name"], manifest["image_type"]), + # "public", + # manifest["tag"]) if __name__ == "__main__": diff --git a/libs/openbook_client.py b/libs/openbook_client.py index d938db1..9759364 100644 --- a/libs/openbook_client.py +++ b/libs/openbook_client.py @@ -53,4 +53,4 @@ class OpenbookClient(object): def get_service_managers(self): self.get(url="%s/serviceManagers") - return [obj["conectionUrl"] for obj in self.json + return [{"name": obj["name"], "connectionUrl": obj["conectionUrl"]} for obj in self.json |