IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Import just IPAChangeConf instead of the whole module

Browse Source 
https://fedorahosted.org/freeipa/ticket/6392

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Stanislav Laznicka 2016-11-03 12:38:57 +01:00 committed by Jan Cholasta
parent b068d3336a
commit a3c9def4e9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipaserver/install/server/replicainstall.py
View File

@ -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 = []