Sync upstream patches down to openshift #110
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
openshift-ci-robot
added
the
approved
|
/lgtm |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
4 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
derekhiggins
force-pushed
the
sync-down
branch
from
192a6fb
to
070157d
Compare
openshift-ci-robot
added
needs-rebase
Removing a forgotten mdns configuration parameter that might interfere if mdns is disabled.
[conductor]bootloader is expecting either a glance image ID or a URL, set it to the httpd server and copy the esp image in there on startup.
Currently, log files is disabled by metal3-io#46. This PR aims to remove this outdated infomation from README.md Signed-off-by: Kim Bao Long <longkb@vn.fujitsu.com>
The bootloader was copied to the html folder in runironic-conductor while some other scripts are used to start ironic. Moving the copy to runhttpd as the file is served by httpd.
It was missing the port, always going to port 80 when httpd listens on 6180 in BMO deployments
Users may have set some ironic options using env variables. Log them to that its more obvious that they have been set.
Without this configuration, the ipmitool timeout is 1 second. This is too short for vbmc. This commit uses the ipmitool retry feature and extends the timeout
Using the default entrypoint, which runs both the ironic-api and ironic-conductor processes in the same container, the container should exit immediately if either of those processes ends.
This reverts commit f95983f. This is no longer needed as we are about to being in the jinja changes from upstream.
This centralizes the cryptic configuration done in multiple files. In addition, it configures json_rpc to be authenticated when API and conductor are running in the same container and HTTP_BASIC_HTPASSWD is set. API and json_rpc would accept the same credentials. This is to prevent other processes in the same host to access the RPC interface over localhost.
When running both API and Conductor in the same container, we'll generate the username and password if not given by the user through the ironic-rpc auth config file.
This commit allows the user to start Ironic using TLS on all endpoints, by providing the following files : - /certs/ironic/tls.crt - /certs/ironic/tls.key - /certs/ca/ironic/tls.crt - /certs/ironic-inspector/tls.crt - /certs/ca/ironic-inspector/tls.crt If something is not provided,it will default to HTTP instead.
derekhiggins
force-pushed
the
sync-down
branch
from
070157d
to
67de067
Compare
openshift-ci-robot
removed
the
needs-rebase
|
/unhold |
openshift-ci-robot
removed
the
do-not-merge/hold
elfosardo
approved these changes
Oct 15, 2020
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: derekhiggins, elfosardo The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
andfasano
pushed a commit
to andfasano/ironic-image
that referenced
this pull request
Nov 18, 2020
Use generic python-chardet
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.
This includes most of the upstream patches to the ironic image, with the exception of