openstack: make dhcp files available to UPI too #2606
Conversation
This removes the `dhclient.conf` and `dhcp-client.conf` files that OpenStack uses from the `pkg/tfvars/openstack/bootstrap_ignition.go` file to `data/data/bootstrap/openstack`. From there, the files are picked automatically by both IPI and UPI. The `bootstrap_ignition.go` contents were only available by the IPI, leading to duplication of effort and having to maintain the same content in two places.
The dhcp config files are now generated as part of `openshift-install create ignition-configs` so we don't need to create them explicitly. The hostname still remains, because the bootstrap template data does not make the `infraID` available.
openshift-ci-robot
added
the
size/M
|
/label platform/openstack |
|
/test e2e-openstack This looks like an OpenStack env issue rather than a bug with this patch. Retesting and also re-running it locally. |
|
/lgtm Clean & tidy! |
|
Okay, this worked locally. The "glitch in the OpenStack CI" hypothesis seems to hold up. |
|
/retest |
|
/hold We're in a feature freeze and this is a feature. We hold off merging until the 4.4 master opens. |
openshift-ci-robot
added
the
do-not-merge/hold
|
/uncc @jstuever |
we should be okay to merge towards 4.4 now.. Thanks! /hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
|
/test all |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya, pierreprinetti, tomassedovic 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 |
openshift-ci-robot
added
the
approved
|
/retest Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
@tomassedovic: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
The OpenStack provider requires two extra configuration files on the bootstrap node. Without this patch, they're only available to the IPI installer and the UPI process needs to add them to the ignition explicitly.
This makes the UPI process more arduous than it needs to be and it can pose maintenance issues later on.
By moving them under
data/data/bootstrap/openstack/, these files will be generated withopenshift-install create ignition-configsand therefore available to both IPI and UPI.