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

Set external IP env var for ironic conductor too. #176

Merged
merged 1 commit into from Jul 23, 2021

Conversation

imain
Copy link
Contributor

@imain imain commented Jul 21, 2021

We need to set this for ironic conductor also as it is the thing
responsible for setting up the callback.

We need to set this for ironic conductor also as it is the thing
responsible for setting up the callback.
@openshift-ci openshift-ci bot requested review from andfasano and sadasu July 21, 2021 21:11
@imain
Copy link
Contributor Author

imain commented Jul 22, 2021

/test e2e-metal-ipi

@imain
Copy link
Contributor Author

imain commented Jul 22, 2021

/assign @asalkeld

@asalkeld
Copy link
Contributor

any chance of some unit tests while you are at it? We are short on them..

Copy link
Member

@zaneb zaneb left a comment

Choose a reason for hiding this comment

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

/lgtm

@@ -607,6 +607,7 @@ func createContainerMetal3IronicConductor(images *Images, config *metal3iov1alph
buildEnvVar(provisioningInterface, config),
buildSSHKeyEnvVar(sshKey),
setIronicHtpasswdHash(htpasswdEnvVar, ironicrpcSecretName),
setIronicExternalIp(externalIpEnvVar, config),
Copy link
Member

Choose a reason for hiding this comment

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

I'm not clear why this isn't being done through buildEnvVar, but it matches the one for ironic-api.

Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like because there is some additional logic around Disabled provisioning network, and AFAICS the conditional in buildEnvVar only handles PROVISIONING_IP not IRONIC_EXTERNAL_IP

Maybe that can be refactored in future, but as you say this looks Ok for now?

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2021
@asalkeld
Copy link
Contributor

/retest

@hardys
Copy link
Contributor

hardys commented Jul 23, 2021

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 23, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hardys, imain

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2021
@openshift-merge-robot openshift-merge-robot merged commit 53e51e2 into openshift:master Jul 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants