This repository has been archived by the owner on Jul 9, 2020. It is now read-only.
Fixes #25172 - support both FreeIPA and Red Hat IDM in user_data and finish templates #527
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
mmoll
reviewed
Oct 10, 2018
| @@ -50,7 +50,7 @@ yum -y install ntpdate | |||
|
|
|||
| <%= snippet 'redhat_register' %> | |||
|
|
|||
| <% if host_enc['parameters']['realm'] && @host.realm && @host.realm.realm_type == 'FreeIPA' -%> | |||
| <% if host_enc['parameters']['realm'] && @host.realm && ( @host.realm.realm_type == 'FreeIPA' || @host.realm.realm_type == 'Red Hat Identity Management') -%> | |||
There was a problem hiding this comment.
one space too much after the bracket.
|
merged, thanks @chr15p! |
|
@mmoll I cherry picked the previous patch. Are you doing so as well? |
|
@ekohl yes, I did 👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Similar to #520 The kickstart_default_finish and kickstart_default_user_data templates both assume the value of @host.realm.realm_type will either be FreeIPA or Active Directory, but Satellite only allows the creates of AD or "Red Hat Identity Management" type realms.
This brings these two templates into line with the kickstart_default kickstart file