Index: /gip/trunk/gip/providers/osg_info_timestamp.py
===================================================================
--- /gip/trunk/gip/providers/osg_info_timestamp.py (revision 2158)
+++ /gip/trunk/gip/providers/osg_info_timestamp.py (revision 2820)
@@ -6,4 +6,5 @@
 sys.path.append(os.path.expandvars("$GIP_LOCATION/lib/python"))
 from gip_common import config, getTemplate, getLogger, printTemplate
+from gip_cluster import getSubClusterIDs, getClusterID
 
 # Retrieve our logger in case of failure
@@ -22,16 +23,17 @@
         # To view its contents, see $VDT_LOCATION/gip/templates/GlueCluster
         template = getTemplate("GlueCluster", "GlueLocationLocalID")
+        cluster_id = getClusterID(cp)
+        for subClusterId in getSubClusterIDs(cp):
+            # Dictionary of data to fill in for GlueLocationLocalID
+            info = {'locationId':   'TIMESTAMP',
+                    'subClusterId': subClusterId,
+                    'clusterId':    cluster_id,
+                    'locationName': 'TIMESTAMP',
+                    'version':      epoch,
+                    'path':         now,
+                    }
 
-        # Dictionary of data to fill in for GlueLocationLocalID
-        info = {'locationId':   'TIMESTAMP',
-                'subClusterId': cp.get('ce', 'name'),
-                'clusterId':    cp.get('ce', 'name'),
-                'locationName': 'TIMESTAMP',
-                'version':      epoch,
-                'path':         now,
-               }
-
-        # Spit out our template, fill it with the appropriate info.
-        printTemplate(template, info)
+            # Spit out our template, fill it with the appropriate info.
+            printTemplate(template, info)
 
     except Exception, e: