otc_metadata/services.py

@@ -103,6 +103,11 @@ class Services(object):
         for srv in self.all_services:
             if environment and cloud_environment:
                 cloud_environment_check = False
+                if srv["is_global"] is True:
+                    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: