diff options
author | Simo Sorce <ssorce@redhat.com> | 2010-10-26 10:26:06 -0400 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2010-10-28 07:58:31 -0400 |
commit | c51ce61e4d295cc49a28768231a8d72d9a78f45b (patch) | |
tree | 6d36bfbfbd5f8a35fcdcb4c1ecb258c48de8fcc7 /ipalib/plugins | |
parent | 1bfd0f87917cfcab206c6d7da32ce507ef1d7eea (diff) | |
download | freeipa-c51ce61e4d295cc49a28768231a8d72d9a78f45b.tar.gz freeipa-c51ce61e4d295cc49a28768231a8d72d9a78f45b.tar.xz freeipa-c51ce61e4d295cc49a28768231a8d72d9a78f45b.zip |
UUIDs: remove uuid python plugin and let DS always autogenerate
merge in remove uuid
Diffstat (limited to 'ipalib/plugins')
-rw-r--r-- | ipalib/plugins/baseldap.py | 4 | ||||
-rw-r--r-- | ipalib/plugins/migration.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index caa616a79..2445ef7fa 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -23,7 +23,7 @@ Base classes for LDAP plugins. import re import json -from ipalib import crud, errors, uuid +from ipalib import crud, errors from ipalib import Method, Object from ipalib import Flag, Int, List, Str from ipalib.base import NameSpace @@ -266,7 +266,7 @@ class LDAPCreate(CallbackInterface, crud.Create): ) if self.obj.uuid_attribute: - entry_attrs[self.obj.uuid_attribute] = str(uuid.uuid1()) + entry_attrs[self.obj.uuid_attribute] = 'autogenerate' if options.get('all', False): attrs_list = ['*'] diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index 39f09eeda..6dc993423 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -27,7 +27,7 @@ Example: Migrate users and groups from DS to IPA import logging import re -from ipalib import api, errors, output, uuid +from ipalib import api, errors, output from ipalib import Command, List, Password, Str, Flag from ipalib.cli import to_cli if api.env.in_server and api.env.context in ['lite', 'server']: @@ -58,7 +58,7 @@ def _pre_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx): ctx['def_group_gid'] = g_attrs['gidnumber'][0] # fill in required attributes by IPA - entry_attrs['ipauniqueid'] = str(uuid.uuid1()) + entry_attrs['ipauniqueid'] = 'autogenerate' if 'homedirectory' not in entry_attrs: homes_root = config.get('ipahomesrootdir', ('/home', ))[0] home_dir = '%s/%s' % (homes_root, pkey) @@ -112,7 +112,7 @@ def _pre_migrate_group(ldap, pkey, dn, entry_attrs, failed, config, ctx): entry_attrs['member'] = [] entry_attrs['member'] += new_members - entry_attrs['ipauniqueid'] = str(uuid.uuid1()) + entry_attrs['ipauniqueid'] = 'autogenerate' convert_members('member', overwrite=True) convert_members('uniquemember') |