diff options
author | Martin Basti <mbasti@redhat.com> | 2015-04-27 14:42:31 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2015-05-05 11:56:49 +0200 |
commit | 522cbb23f129033f836e40282ca41e76d315cbe3 (patch) | |
tree | 5990a234426982bb6602b469768dc28332bfc260 /ipaserver/install/bindinstance.py | |
parent | 978298882b06dcf8a86a8d6ec60d7f1266aac697 (diff) | |
download | freeipa-522cbb23f129033f836e40282ca41e76d315cbe3.tar.gz freeipa-522cbb23f129033f836e40282ca41e76d315cbe3.tar.xz freeipa-522cbb23f129033f836e40282ca41e76d315cbe3.zip |
move realm_to_serverid to installutils module
To avoid cyclic imports realm_to_serverid function had to be moved to
installutils from dsinstance.
Required for: https://fedorahosted.org/freeipa/ticket/4925
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipaserver/install/bindinstance.py')
-rw-r--r-- | ipaserver/install/bindinstance.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 97dcb3d95..4c1bfa600 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -30,7 +30,6 @@ import ldap import installutils import service from ipaserver.plugins import ldap2 -from ipaserver.install.dsinstance import realm_to_serverid from ipaserver.install.cainstance import IPA_CA_RECORD from ipapython import sysrestore, ipautil, ipaldap from ipapython.ipa_log_manager import * @@ -727,7 +726,7 @@ class BindInstance(service.Service): DOMAIN=self.domain, HOST=self.host, REALM=self.realm, - SERVER_ID=realm_to_serverid(self.realm), + SERVER_ID=installutils.realm_to_serverid(self.realm), FORWARDERS=fwds, SUFFIX=self.suffix, OPTIONAL_NTP=optional_ntp, |