summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/dsinstance.py4
-rw-r--r--ipaserver/install/krbinstance.py3
-rw-r--r--ipaserver/install/ldapupdate.py3
-rw-r--r--ipaserver/install/service.py5
4 files changed, 5 insertions, 10 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 26cf3d3ba..20f655acb 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -39,7 +39,7 @@ from ldap.dn import escape_dn_chars
from ipaserver import ipaldap
from ipaserver.install import ldapupdate
from ipaserver.install import httpinstance
-from ipalib import util, uuid, errors
+from ipalib import util, errors
from ipaserver.plugins.ldap2 import ldap2
SERVER_ROOT_64 = "/usr/lib64/dirsrv"
@@ -475,9 +475,7 @@ class DsInstance(service.Service):
self._ldap_mod("ldapi.ldif", self.sub_dict)
def add_hbac(self):
- self.sub_dict['UUID'] = str(uuid.uuid1())
self._ldap_mod("default-hbac.ldif", self.sub_dict)
- del self.sub_dict['UUID']
def change_admin_password(self, password):
logging.debug("Changing admin password")
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 736ba7362..e78155dc4 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -32,7 +32,6 @@ from ipapython import sysrestore
from ipapython import ipautil
from ipalib import util
from ipalib import errors
-from ipalib import uuid
from ipaserver import ipaldap
@@ -121,7 +120,7 @@ class KrbInstance(service.Service):
host_entry.setValue('serverhostname', self.fqdn.split('.',1)[0])
host_entry.setValue('cn', self.fqdn)
host_entry.setValue('fqdn', self.fqdn)
- host_entry.setValue('ipauniqueid', str(uuid.uuid1()))
+ host_entry.setValue('ipauniqueid', 'autogenerate')
host_entry.setValue('managedby', host_dn)
conn.addEntry(host_entry)
conn.unbind()
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)
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()