summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2016-11-03 12:38:57 +0100
committerJan Cholasta <jcholast@redhat.com>2016-11-11 12:13:56 +0100
commita3c9def4e982bcc90e9ece0900993ace53777906 (patch)
tree286b8aec3c67746d69df717a665e3de1ed96fe5d /ipaserver
parentb068d3336ad65748881d0dc74505f41dac9f0f13 (diff)
Import just IPAChangeConf instead of the whole module
https://fedorahosted.org/freeipa/ticket/6392 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/server/replicainstall.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index 663fb839c..54ada077b 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -34,8 +34,8 @@ from ipalib.util import (
broadcast_ip_address_warning,
)
from ipaclient.install.client import configure_krb5_conf, purge_host_keytab
-import ipaclient.ipachangeconf
import ipaclient.ntpconf
+from ipaclient.ipachangeconf import IPAChangeConf
from ipaserver.install import (
bindinstance, ca, certs, dns, dsinstance, httpinstance,
installutils, kra, krbinstance, memcacheinstance,
@@ -224,7 +224,7 @@ def create_ipa_conf(fstore, config, ca_enabled):
target_fname = paths.IPA_DEFAULT_CONF
fstore.backup_file(target_fname)
- ipaconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Replica Install")
+ ipaconf = IPAChangeConf("IPA Replica Install")
ipaconf.setOptionAssignment(" = ")
ipaconf.setSectionNameDelimiters(("[", "]"))
@@ -495,8 +495,7 @@ def promote_openldap_conf(hostname, master):
ldap_conf = paths.OPENLDAP_LDAP_CONF
- ldap_change_conf = ipaclient.ipachangeconf.IPAChangeConf(
- "IPA replica installer")
+ ldap_change_conf = IPAChangeConf("IPA replica installer")
ldap_change_conf.setOptionAssignment((" ", "\t"))
new_opts = []