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 /ipaserver/install/service.py | |
| 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 'ipaserver/install/service.py')
| -rw-r--r-- | ipaserver/install/service.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 4affef457..43437306e 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -22,7 +22,7 @@ import os import tempfile from ipapython import sysrestore from ipapython import ipautil -from ipalib import uuid, errors +from ipalib import errors import ldap from ipaserver import ipaldap import base64 @@ -104,7 +104,6 @@ class Service: path = ipautil.SHARE_DIR + ldif if sub_dict is not None: - sub_dict['UUID'] = str(uuid.uuid1()) txt = ipautil.template_file(path, sub_dict) fd = ipautil.write_tmp_file(txt) path = fd.name @@ -153,7 +152,7 @@ class Service: classes = entry.getValues("objectclass") classes = classes + ["ipaobject", "ipaservice", "pkiuser"] entry.setValues("objectclass", list(set(classes))) - entry.setValue("ipauniqueid", str(uuid.uuid1())) + entry.setValue("ipauniqueid", 'autogenerate') entry.setValue("managedby", hostdn) conn.addEntry(entry) conn.unbind() |