otc_metadata/services.py

@@ -104,7 +104,10 @@ class Services(object):
             if environment and cloud_environment:
                 cloud_environment_check = False
                 if srv["is_global"] is True:
-                    continue
+                    if srv["environment"] == environment:
+                        cloud_environment_check = True
+                    else:
+                        continue
                 if srv["is_global"] is not True:
                     for srv_cloud_environment in srv["cloud_environments"]:
                         if srv_cloud_environment["name"] == cloud_environment: