glance gateway improvements

1 files changed, 24 insertions, 7 deletions

diff --git a/glance-gateway.py b/glance-gateway.py
index c964eb0..0a7f2c6 100755
--- a/glance-gateway.py
+++ b/glance-gateway.py
@@ -4,7 +4,8 @@ from __future__ import print_function
 from libs.environment import *
 from libs.glance import *
 from libs.keystone import *
-from libs.openbook_client import *
+# from libs.openbook_client import *
+from libs.service_status_client import *
 import argparse
 import glob
 import os
@@ -42,6 +43,7 @@ def main(args):
                           args.os_image_api_version,
                           {
                               "manifests_path": args.glance_gateway_manifests_path,
+                              "service_status_host": args.service_status_host,
                               "openbook_host": args.openbook_host,
                               "openbook_port": args.openbook_port,
                               "openbook_user": args.openbook_user,
@@ -56,12 +58,22 @@ def main(args):
             glance_src.download("%s.%s.unvetted" % (manifest["image_name"], manifest["image_type"]),
                                 "/tmp/%s.%s" % (manifest["image_name"], manifest["image_type"]))
             # get AUTH_URLs
-            ob_client = OpenbookClient(host=env_src.extra_envs["openbook_host"],
-                                       port=env_src.extra_envs["openbook_port"],
-                                       username=env_src.extra_envs["openbook_user"],
-                                       password=env_src.extra_envs["openbook_pass"])
-            regions = ob_client.get_service_managers()
-            regions_filtered = regions if manifest["regions_to_exclude"] is None else [region for region in regions if region["name"] not in manifest["regions_to_exclude"]]
+            # ob_client = OpenbookClient(host=env_src.extra_envs["openbook_host"],
+            #                            port=env_src.extra_envs["openbook_port"],
+            #                            username=env_src.extra_envs["openbook_user"],
+            #                            password=env_src.extra_envs["openbook_pass"])
+            # regions = ob_client.get_service_managers()
+            service_status_client = ServiceStatusClient(host=env_src.extra_envs["service_status_host"])
+            regions = service_status_client.get_service_managers()
+            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:
+                regions_filtered = [r for r in regions if r["name"] not in manifest["regions_to_exclude"]]
+            elif manifest["regions_to_exclude"] is None and manifest["regions_to_include"] is not None:
+                regions_filtered = [r for r in regions if r["name"] in manifest["regions_to_include"]]
+            else:
+                regions_filtered = [r for r in regions if r["name"] not in manifest["regions_to_exclude"] and r["name"] in manifest["regions_to_include"]]
+            # regions_filtered = [{"name": "RegionOne", "connectionUrl": "http://os.pippiandcarlos.com:5000/v3"}]
             for region in regions_filtered:
                 # upload image as public
                 env_dest = Environment(region["connectionUrl"],
@@ -75,6 +87,7 @@ def main(args):
                                        args.os_image_api_version,
                                        {
                                            "manifests_path": args.glance_gateway_manifests_path,
+                                           "service_status_host": args.service_status_host,
                                            "openbook_host": args.openbook_host,
                                            "openbook_port": args.openbook_port,
                                            "openbook_user": args.openbook_user,
@@ -131,6 +144,10 @@ if __name__ == "__main__":
                         required=False,
                         default=os.environ.get("GLANCE_GATEWAY_MANIFESTS_PATH", None),
                         help="image-foundry environment variable: GLANCE_GATEWAY_MANIFESTS_PATH")
+    parser.add_argument("--service-status-host",
+                        required=False,
+                        default=os.environ.get("SERVICE_STATUS_HOST", None),
+                        help="The hostname or IP of the node where service-status is running (or the load balancer frontend to same).")
     parser.add_argument("--openbook-host",
                         required=False,
                         default=os.environ.get("OPENBOOK_HOST", None),