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/upgradeinstance.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/upgradeinstance.py')
| -rw-r--r-- | ipaserver/install/upgradeinstance.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 160b735c8..08d5e91fb 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -26,7 +26,6 @@ from ipaplatform.paths import paths from ipapython.ipa_log_manager import * from ipaserver.install import installutils -from ipaserver.install import dsinstance from ipaserver.install import schemaupdate from ipaserver.install import ldapupdate from ipaserver.install import service @@ -51,7 +50,7 @@ class IPAUpgrade(service.Service): h = "%02x" % rand.randint(0,255) ext += h service.Service.__init__(self, "dirsrv") - serverid = dsinstance.realm_to_serverid(realm_name) + serverid = installutils.realm_to_serverid(realm_name) self.filename = '%s/%s' % (paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % serverid, DSE) self.savefilename = '%s/%s.ipa.%s' % (paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % serverid, DSE, ext) self.files = files |