summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/dsinstance.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/dsinstance.py
parent1bfd0f87917cfcab206c6d7da32ce507ef1d7eea (diff)
downloadfreeipa-c51ce61e4d295cc49a28768231a8d72d9a78f45b.zip
freeipa-c51ce61e4d295cc49a28768231a8d72d9a78f45b.tar.gz
freeipa-c51ce61e4d295cc49a28768231a8d72d9a78f45b.tar.xz
UUIDs: remove uuid python plugin and let DS always autogenerate
merge in remove uuid
Diffstat (limited to 'ipaserver/install/dsinstance.py')
-rw-r--r--ipaserver/install/dsinstance.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 26cf3d3..20f655a 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")