Merge latest changes from upstream #2
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
Ironic API will happily start without database connection, while Conductor requires database on start-up. Running dbsync in two places is potentially racy, so limit it to Conductor only.
Limit dbsync to only the Conductor entry point
This is consistent with ironic-inspector and results in a more complete image. The `crudini --merge` command is used and the options are sorted for readability. Also adds missing use_stderr to make `podman logs` display something, otherwise the usage of --log-file silences stderr.
Do static configuration of ironic.conf when building the image
openshift-ci-robot
added
the
size/L
elfosardo
approved these changes
Jul 10, 2019
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.
No description provided.