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

Fixes #25036 - ensure proxy registration happens before puppet #456

Merged
merged 2 commits into from
Oct 8, 2018

Conversation

evgeni
Copy link
Member

@evgeni evgeni commented Sep 25, 2018

No description provided.

@theforeman-bot
Copy link
Member

@evgeni, the Redmine ticket used is for a different project than the one associated with this GitHub repository. Please either:

If changing the ticket number used, remember to update the PR title and the commit message (using git commit --amend).


This message was auto-generated by Foreman's prprocessor

@evgeni
Copy link
Member Author

evgeni commented Sep 25, 2018

failures seem unrelated

# Ensure the service is started after registering the Foreman proxy
# Relationship is duplicated there as defined() is parse-order dependent
if defined(Class['puppet::agent::service']) {
Foreman_smartproxy[$foreman_proxy::registered_name] -> Class['puppet::agent::service']
Copy link
Member

Choose a reason for hiding this comment

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

If you rewrite this to -> Class <| title == 'puppet::agent::service' |> I believe you don't need the defined and it's no longer parse-order dependent.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

but you can:

    Foreman_smartproxy[$foreman_proxy::registered_name] -> Cron <| title == 'puppet' |>
    Foreman_smartproxy[$foreman_proxy::registered_name] -> Service <| title == 'puppet' |>
    Foreman_smartproxy[$foreman_proxy::registered_name] -> Service <| title == 'puppet-run.timer' |>

Copy link
Member Author

Choose a reason for hiding this comment

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

Seems to have worked in my test setup.

@mmoll
Copy link
Contributor

mmoll commented Oct 7, 2018

@evgeni pelase rebase

@evgeni
Copy link
Member Author

evgeni commented Oct 8, 2018

@mmoll rebase on what? this is based on master.

@mmoll
Copy link
Contributor

mmoll commented Oct 8, 2018

Hrm, I thought the beakers tests work now, but it seems we would need to release some of our modules.... testing locally now

@mmoll mmoll merged commit 1a9b2b4 into theforeman:master Oct 8, 2018
@mmoll
Copy link
Contributor

mmoll commented Oct 8, 2018

merged, cпасибо @evgeni!

@ekohl ekohl added Bug and removed Needs re-review labels Oct 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants