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.

Sign up for GitHub

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

Jump to bottom

openstack: make dhcp files available to UPI too #2606

Merged
merged 2 commits into from Nov 23, 2019
Merged

openstack: make dhcp files available to UPI too #2606

merged 2 commits into from Nov 23, 2019

Commits on Nov 1, 2019

  1. Move OpenStack extra files to bootstrap/openstack 

    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.
    @tomassedovic
    tomassedovic committed Nov 1, 2019
    Copy the full SHA
    2a5d42f View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary OpenStack UPI doc modifications 

    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.
    @tomassedovic
    tomassedovic committed Nov 1, 2019
    Copy the full SHA
    f670689 View commit details
    Browse the repository at this point in the history