node_dict[node_xrn.urn] = rspec_node
             else:
                 rspec_node = node_dict[node_xrn.urn]
+
+            if instance.metadata.get('client_id'):
+                rspec_node['client_id'] = instance.metadata.get('client_id')
             
             flavor = self.driver.shell.nova_manager.flavors.find(id=instance.flavor['id'])
             sliver = instance_to_sliver(flavor)
                     metadata['security_groups'] = group_name
                     if node.get('component_id'):
                         metadata['component_id'] = node['component_id']
+                    if node.get('client_id'):
+                        metadata['client_id'] = node['client_id']
                     self.driver.shell.nova_manager.servers.create(flavor=flavor_id,
                                                             image=image_id,
                                                             key_name = key_name,