diff options
author | Jan Cholasta <jcholast@redhat.com> | 2016-11-30 13:55:38 +0100 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2016-12-08 12:08:49 +0100 |
commit | 4fff09978eab520d130d87c0112b5caac907e651 (patch) | |
tree | 7dce492a5daa8df6e9061c3b6396251f317dce14 /ipalib | |
parent | f1678693713dc2a573493e325e93f6f557a5ad5a (diff) | |
download | freeipa-4fff09978eab520d130d87c0112b5caac907e651.tar.gz freeipa-4fff09978eab520d130d87c0112b5caac907e651.tar.xz freeipa-4fff09978eab520d130d87c0112b5caac907e651.zip |
server install: fix external CA install
Replace the dual definitions of domain_name, dm_password and admin_password
knobs in server install with single definitions using the original names
without the 'new_' prefix.
This fixes the options read from the installer option cache in step 2 of
external CA install to use the correct knob names.
https://fedorahosted.org/freeipa/ticket/6392
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
Diffstat (limited to 'ipalib')
-rw-r--r-- | ipalib/install/service.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ipalib/install/service.py b/ipalib/install/service.py index 2544e5b85..fc430fb18 100644 --- a/ipalib/install/service.py +++ b/ipalib/install/service.py @@ -146,7 +146,6 @@ class ServiceInstallInterface(common.Installable, str, None, description="a file generated by ipa-replica-prepare", ) - replica_file = enroll_only(replica_file) replica_file = replica_install_only(replica_file) dm_password = knob( @@ -154,8 +153,6 @@ class ServiceInstallInterface(common.Installable, sensitive=True, description="Directory Manager password (for the existing master)", ) - dm_password = enroll_only(dm_password) - dm_password = replica_install_only(dm_password) class ServiceAdminInstallInterface(ServiceInstallInterface): @@ -175,4 +172,3 @@ class ServiceAdminInstallInterface(ServiceInstallInterface): sensitive=True, ) admin_password = enroll_only(admin_password) - admin_password = replica_install_only(admin_password) |