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 /install/tools/ipa-upgradeconfig | |
| 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 'install/tools/ipa-upgradeconfig')
| -rwxr-xr-x | install/tools/ipa-upgradeconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 8159ce244..dfef1e0aa 100755 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -1132,7 +1132,7 @@ def fix_schema_file_syntax(): root_logger.info('Syntax already fixed') return - serverid = dsinstance.realm_to_serverid(api.env.realm) + serverid = installutils.realm_to_serverid(api.env.realm) ds_dir = dsinstance.config_dirname(serverid) # 1. 60ipadns.ldif: Add parenthesis to idnsRecord @@ -1191,7 +1191,7 @@ def remove_ds_ra_cert(subject_base): return dbdir = dsinstance.config_dirname( - dsinstance.realm_to_serverid(api.env.realm)) + installutils.realm_to_serverid(api.env.realm)) dsdb = certs.CertDB(api.env.realm, nssdir=dbdir, subject_base=subject_base) nickname = 'CN=IPA RA,%s' % subject_base @@ -1309,7 +1309,7 @@ def main(): 'ca.crl.MasterCRL.enableCRLUpdates', '=') sub_dict['CLONE']='#' if crl.lower() == 'true' else '' - ds_serverid = dsinstance.realm_to_serverid(api.env.realm) + ds_serverid = installutils.realm_to_serverid(api.env.realm) ds_dirname = dsinstance.config_dirname(ds_serverid) upgrade(sub_dict, paths.HTTPD_IPA_CONF, ipautil.SHARE_DIR + "ipa.conf") |