Add force-join option to replica install #691
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ipaserver/install/server/__init__.py
Outdated
| @@ -177,6 +176,9 @@ class ServerInstallInterface(ServerCertificateInstallInterface, | |||
| preserve_sssd = False | |||
| no_sssd = False | |||
|
|
|||
| force_join = client.ClientInstallInterface.force_join | |||
| force_join = replica_install_only(force_join) | |||
There was a problem hiding this comment.
This bit seems to be unnecessary, since you are masking force_join in ServerMasterInstall with a constant.
There was a problem hiding this comment.
Right. I meant to provide a more general approach but it probably does not make much sense here.
ipaserver/install/server/__init__.py
Outdated
| @@ -595,6 +595,8 @@ class ServerReplicaInstall(ServerReplicaInstallInterface): | |||
| subject_base = None | |||
| ca_subject = None | |||
|
|
|||
| force_join = client.ClientInstallInterface.force_join | |||
There was a problem hiding this comment.
I meant this bit as well, force_join is already present in ServerReplicaInstall through inheritance.
There was a problem hiding this comment.
Bah, I must be broken today, you're right, of course.
When installing client from inside replica installation on DL1, it's possible that the client installation would fail and recommend using --force-join option which is not available in replica installer. Add the option there. https://pagure.io/freeipa/issue/6183
The exception handling of client install inside replica installation was rather promiscuous, hungrily eating any possible exception thrown at it. Scoped down the try-except block and reduced its promiscuity. This change should improve the future development experience debugging this part of the code. https://pagure.io/freeipa/issue/6183
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patchset adds the force-join option to the replica installer. It also tries to improve the developer's experience by narrowing down the scope of originally an all-eating try-except block.