summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/ldapupdate.py
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-10-26 10:26:06 -0400
committerSimo Sorce <ssorce@redhat.com>2010-10-28 07:58:31 -0400
commitc51ce61e4d295cc49a28768231a8d72d9a78f45b (patch)
tree6d36bfbfbd5f8a35fcdcb4c1ecb258c48de8fcc7 /ipaserver/install/ldapupdate.py
parent1bfd0f87917cfcab206c6d7da32ce507ef1d7eea (diff)
downloadfreeipa-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/ldapupdate.py')
-rw-r--r--ipaserver/install/ldapupdate.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py
index 91ff80f55..3ab5a0e4d 100644
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -28,7 +28,7 @@ import sys
from ipaserver.install import installutils
from ipaserver import ipaldap
from ipapython import entity, ipautil
-from ipalib import util, uuid
+from ipalib import util
from ipalib import errors
import ldap
from ldap.dn import escape_dn_chars
@@ -143,7 +143,6 @@ class LDAPUpdate:
def _template_str(self, s):
try:
- self.sub_dict["UUID"] = str(uuid.uuid1())
return ipautil.template_str(s, self.sub_dict)
except KeyError, e:
raise BadSyntax("Unknown template keyword %s" % e)