Index: keystone/identity/shadow_backends/sql.py
<+>UTF-8
===================================================================
--- keystone/identity/shadow_backends/sql.py	(revision 012bc3d436fb29ef99aec405d13af5e5a1cfd3df)
+++ keystone/identity/shadow_backends/sql.py	(revision )
@@ -22,7 +22,7 @@
     @sql.handle_conflicts(conflict_type='federated_user')
     def create_federated_user(self, federated_dict):
         user = {
-            'id': uuid.uuid4().hex,
+            'id': federated_dict['unique_id'] if 'unique_id' in federated_dict else uuid.uuid4().hex,
             'enabled': True
         }
         with sql.session_for_write() as session: