Fixes #29589 - Ensure pulpcore before proxy #252
Merged
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
When the Foreman Proxy registration happens, Pulp's features are queried and presented as capabilities. If the service is down, Katello can't detect the right content types.
|
Looks sane but that dependency cycle is funky with the daemon reloads chaining together. |
|
Yes. That isn't needed in Puppet >= 6.1 but for now we have to support Puppet 5 too. The workaround is to not let |
ehelms
reviewed
Apr 28, 2020
| @@ -338,6 +338,7 @@ | |||
| postgresql_db_ssl_cert => $pulpcore_postgresql_ssl_cert, | |||
| postgresql_db_ssl_key => $pulpcore_postgresql_ssl_key, | |||
| postgresql_db_ssl_root_ca => $pulpcore_postgresql_ssl_root_ca, | |||
| before => Class['foreman_proxy::plugin::pulp'], | |||
There was a problem hiding this comment.
Could we do it before the register?
iff --git a/manifests/init.pp b/manifests/init.pp
index 9bea8db..78d833a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -338,6 +338,7 @@ class foreman_proxy_content (
postgresql_db_ssl_cert => $pulpcore_postgresql_ssl_cert,
postgresql_db_ssl_key => $pulpcore_postgresql_ssl_key,
postgresql_db_ssl_root_ca => $pulpcore_postgresql_ssl_root_ca,
+ before => Class['foreman_proxy::register'],
}
if $pulp_master {
There was a problem hiding this comment.
Strange, I made this change, ran tests. Everything passed. I ran it again, got these failures. Perhaps my fixtures weren't up to date? Implies it was a more recent change that led to this?
There was a problem hiding this comment.
|
theforeman/puppet-puppet#741 would remove the dependency cycle. Once that's merged, tests can be restarted. |
ehelms
approved these changes
May 5, 2020
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.
When the Foreman Proxy registration happens, Pulp's features are queried and presented as capabilities. If the service is down, Katello can't detect the right content types.