sampledata does not work with real LDAP backend

[Enol Fernández]

I have an LDAP server installed for testing KeyStone. I have imported the schema into the server and created the tree.
When I try to run the sampledata script, it fails with the following error:

INVALID_SYNTAX: {'info': 'keystoneName: value #0 invalid per syntax', 'desc': 'Invalid syntax'}

The log shows that the LDAP add was tried:
2011-12-15 16:47:02 DEBUG [keystone.backends.ldap.api] LDAP init: url=ldap://localhost
2011-12-15 16:47:02 DEBUG [keystone.backends.ldap.api] LDAP bind: dn=cn=admin,dc=example,dc=com
2011-12-15 16:47:02 DEBUG [keystone.backends.ldap.api] LDAP add: dn=cn=5eeb338f-f457-4989-965f-eed052e85f27,ou=Groups,dc=example,dc=com, attrs=[('objectClass', ['groupOfNames', 'keystoneTenant']), ('keystoneEnabled', ['TRUE']), ('keystoneName', ['customer-x']), ('member', ['cn=dumb,dc=nonexistent'])]

keystoneName is defined in the ldap schema as distinguishedName so the ldap insertion fails with the invalid syntax error. If I manually insert in the ldap the same object with a correct keystoneName it is shown then by the keystone-admin tool.

[Ziad Sawalha (ziad-sawalha)]

We'll try to get this in by E3.

[Ralf Haferkamp (rhafer)]

I suppose keystoneName should be a subtype of "name" instead for "distinguishedName". "name" is defined to be of the DirectoryString Syntax, which basically is UTF-8.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/2546

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/2546
Committed: http://github.com/openstack/keystone/commit/03447b10d3e8902ec2751fa4ca27597e39604fd2
Submitter: Jenkins
Branch: master

commit 03447b10d3e8902ec2751fa4ca27597e39604fd2
Author: Ziad Sawalha <email address hidden>
Date: Wed Dec 21 23:35:13 2011 -0600

    Fix LDAP schema (bug 904815)

    As per comments from Ralf Haferkamp (rhafer):
    keystoneName should be a subtype of 'name' instead of 'distinguishedName'. 'name' is defined to be of the DirectoryString Syntax, which basically is UTF-8.

    Change-Id: I29ec92f7974170875ad4bfa4dc009eea86b66839