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/ipa_restore.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/ipa_restore.py')
| -rw-r--r-- | ipaserver/install/ipa_restore.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index b5caad240..cc466c204 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -32,8 +32,7 @@ from ipapython import version, ipautil, certdb, dogtag from ipapython.ipautil import run, user_input from ipapython import admintool from ipapython.dn import DN -from ipaserver.install.dsinstance import (realm_to_serverid, - create_ds_user, DS_USER) +from ipaserver.install.dsinstance import create_ds_user, DS_USER from ipaserver.install.cainstance import PKI_USER, create_ca_user from ipaserver.install.replication import (wait_for_task, ReplicationManager, get_cs_replication_manager) @@ -791,7 +790,7 @@ class Restore(admintool.AdminTool): httpinstance.HTTPInstance().stop_tracking_certificates() try: dsinstance.DsInstance().stop_tracking_certificates( - realm_to_serverid(api.env.realm)) + installutils.realm_to_serverid(api.env.realm)) except OSError: # When IPA is not installed, DS NSS DB does not exist pass @@ -832,5 +831,7 @@ class Restore(admintool.AdminTool): api.bootstrap(in_server=False, context='restore', **overrides) api.finalize() - self.instances = [realm_to_serverid(api.env.realm), 'PKI-IPA'] + self.instances = [ + installutils.realm_to_serverid(api.env.realm), 'PKI-IPA' + ] self.backends = ['userRoot', 'ipaca'] |