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

Remove DL0 specific code from ipa_replica_install in ipaserver/install

Browse Source 
Replica files are DL0 specific therefore the knob extension for
replica_file has been removed. Also the code that is only executed if
replica_file is not None.

The new variable replica_install has been added which is used in
ServerInstallInterface.__init__

See: https://pagure.io/freeipa/issue/7689
Signed-off-by: Thomas Woerner <twoerner@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Thomas Woerner 2018-09-10 15:16:51 +02:00
parent ecf80900ee
commit ae94aae47a
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipaserver/install/ipa_replica_install.py
View File

@ -20,11 +20,7 @@ class CompatServerReplicaInstall(ServerReplicaInstall):
request_cert = False
ca_file = None
zonemgr = None
replica_file = extend_knob(
ServerReplicaInstall.replica_file, # pylint: disable=no-member
cli_names='replica_file',
)
replica_install = True # Used in ServerInstallInterface.__init__
auto_password = knob(
str, None,
@ -44,9 +40,6 @@ class CompatServerReplicaInstall(ServerReplicaInstall):
except AttributeError:
pass
if self.replica_file is not None:
return self.auto_password
return super(CompatServerReplicaInstall, self).dm_password
@dm_password.setter
@ -69,7 +62,7 @@ class CompatServerReplicaInstall(ServerReplicaInstall):
@admin_password.default_getter
def admin_password(self):
if self.replica_file is None and self.principal:
if self.principal:
return self.auto_password
return super(CompatServerReplicaInstall, self).admin_password
@ -78,8 +71,7 @@ class CompatServerReplicaInstall(ServerReplicaInstall):
def host_password(self):
admin_password = (
super(CompatServerReplicaInstall, self).admin_password)
if (self.replica_file is None and
(not self.principal or admin_password)):
if not self.principal or admin_password:
return self.auto_password
return super(CompatServerReplicaInstall, self).host_password