Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.4] Run ipa-custodia under Python 2 #760

Closed
wants to merge 1 commit into from
Closed

[4.4] Run ipa-custodia under Python 2 #760

wants to merge 1 commit into from

Conversation

tiran
Copy link
Member

@tiran tiran commented May 3, 2017 •
edited by tkrizek

Closes: https://pagure.io/freeipa/issue/6926
Signed-off-by: Christian Heimes cheimes@redhat.com

@stlaz stlaz changed the title Run ipa-custodia under Python 2 [4.4] Run ipa-custodia under Python 2 May 4, 2017
stlaz
stlaz reviewed May 5, 2017
View reviewed changes
init/systemd/ipa-custodia.service Outdated
@@ -3,8 +3,7 @@ Description=IPA Custodia Service

[Service]
Type=simple

ExecStart=/usr/sbin/custodia /etc/ipa/custodia/custodia.conf
ExecStart=@libexecdir@/ipa/ipa-custodia /etc/ipa/custodia/custodia.conf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This macro does not get replaced resulting in the service not being properly configured.

@stlaz stlaz self-assigned this May 5, 2017
@stlaz
Copy link
Contributor

stlaz commented May 9, 2017

Works for me. However, I do not see the reason to do custodia > 0.2, please, either provide some or remove it.

@tiran
Run ipa-custodia under Python 2
c804d46 
Closes: https://pagure.io/freeipa/issue/6926
Signed-off-by: Christian Heimes <cheimes@redhat.com>
@tiran
Copy link
Member Author

tiran commented May 9, 2017

The patch doesn't work with custodia 0.1. It needs at least 0.2.0-1.

@stlaz
Copy link
Contributor

stlaz commented May 9, 2017

Alright, thanks. ACK.

@stlaz stlaz added the ack Pull Request approved, can be merged label May 9, 2017
@tkrizek
Copy link
Contributor

tkrizek commented May 9, 2017

@tiran Once this PR is merged, do you plan to remove the conflict with freeipa-server-common < 4.5 from custodia or do we need to address something else as well?

@tiran
Copy link
Member Author

tiran commented May 9, 2017

@tomaskrizek yes, custodia 0.5 will no longer have the restriction.

tiran added a commit to tiran/custodia that referenced this pull request May 9, 2017
@tiran
Remove conflict with ipalib < 4.5
6fca505 
FreeIPA 4.4 will be compatible with recent custodia packages,
freeipa/freeipa#760 (comment)

Signed-off-by: Christian Heimes <cheimes@redhat.com>
@tiran tiran mentioned this pull request May 9, 2017
Merged
tiran added a commit to tiran/custodia that referenced this pull request May 9, 2017
@tiran
Remove conflict with ipalib < 4.5
a28426d 
FreeIPA 4.4 will be compatible with recent custodia packages,
freeipa/freeipa#760 (comment)

Signed-off-by: Christian Heimes <cheimes@redhat.com>
tiran added a commit to tiran/custodia that referenced this pull request May 9, 2017
@tiran
Remove conflict with ipalib < 4.5
63a5cfd 
FreeIPA 4.4 will be compatible with recent custodia packages,
freeipa/freeipa#760 (comment)

Signed-off-by: Christian Heimes <cheimes@redhat.com>
tiran added a commit to latchset/custodia that referenced this pull request May 9, 2017
@tiran
Remove conflict with ipalib < 4.5
0c4ddc7 
FreeIPA 4.4 will be compatible with recent custodia packages,
freeipa/freeipa#760 (comment)

Signed-off-by: Christian Heimes <cheimes@redhat.com>
@tkrizek
Copy link
Contributor

tkrizek commented May 10, 2017 •
edited

Needs re-base for 4.4 and 4.5.

correction: for 4.5 and master.

correction2: Nevermind, this should be already fixed in 4.5+ :)

@tkrizek tkrizek added the pushed Pull Request has already been pushed label May 10, 2017
@tkrizek
Copy link
Contributor

tkrizek commented May 10, 2017

ipa-4-4:

  • 307c4bd Run ipa-custodia under Python 2

@tkrizek tkrizek closed this May 10, 2017
@tiran tiran deleted the custodia-44 branch May 10, 2017 07:08
@lslebodn
Copy link
Contributor

@tiran Do you plan to release custodia-0.2 in fedora 25?
Because this patch broke building of ipa-4.4 on fedora 25.

If you do not plan to upgrade custodia in f25 then this patch should be (partially) reverted

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stlaz stlaz stlaz left review comments

Assignees

@stlaz stlaz

Labels
ack Pull Request approved, can be merged pushed Pull Request has already been pushed
Projects
None yet
Milestone
No milestone
4 participants
@tiran @stlaz @tkrizek @lslebodn