Skip to content

libvirt: switch back to upstream terraform libvirt provider #214

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
Merged
openshift-merge-robot merged 2 commits into from
Sep 6, 2018
Merged

libvirt: switch back to upstream terraform libvirt provider #214

openshift-merge-robot merged 2 commits into from
Sep 6, 2018

Conversation

@eparis
Copy link
Member

@eparis eparis commented Sep 6, 2018

Upstream merged something very similar to our forked changes. Use that.
Also remove the option to set DNS forwarders, we don't need it anymore with local_only=yes

@eparis
Remove the 'dns' options from libvirt
13a7dbb 
This will allow the libvirt nodes to use the hypervisor's DNS instead of
having to hard code some upstream DNS server. Previously this was a
problem if your local machine pointed to the libvirt dnsmasq for DNS
resolution of the nodes. Any unknown address would cause an inifnite
loop. Now, the libvirt dnsmasq will respond that the name is unknown
instead of forwarding it to the hypervisor's DNS server.

Since i can't see a reason for the DNS option, I take it out. Now it
'just works'.
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 6, 2018
@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Sep 6, 2018

/cc @crawford

@abhinavdahiya abhinavdahiya reopened this Sep 6, 2018
@eparis
Copy link
Member Author

eparis commented Sep 6, 2018

didn't like my PR, huh @abhinavdahiya ?

@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Sep 6, 2018

I mistakenly pressed 'close and comment' 😋

@crawford
Copy link
Contributor

crawford commented Sep 6, 2018

@eparis Can you squash those last two commits? Otherwise, it looks perfect.

@eparis
steps/infra/libvirt: use the upstream dns hosts implementation
7e29113 
It is slightly different than the crawford fork.
@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Sep 6, 2018

/refresh

@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Sep 6, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 6, 2018
@crawford
Copy link
Contributor

crawford commented Sep 6, 2018

/lgtm

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 6, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, crawford, eparis

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [abhinavdahiya,crawford]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@steveej
Copy link
Contributor

steveej commented Sep 6, 2018 •
edited
Loading

I removed the dns key from libvirt.network from my previously working tectonic.libvirt.yaml file, then from scratch built a cluster with tectonic init and tectonic install.

(...)
Error: libvirt_network.tectonic_net: : invalid or unknown key: dns


FATA[0015] Failed to run Terraform: exit status 1

Can someone else reproduce this?

@eparis
Copy link
Member Author

eparis commented Sep 6, 2018

@steveej gotta do: GOBIN=~/.terraform.d/plugins go get -u github.com/dmacvicar/terraform-provider-libvirt

@openshift-merge-robot openshift-merge-robot merged commit d07ab5c into openshift:master Sep 6, 2018
This was referenced Sep 6, 2018
Merged
Closed
wking added a commit to wking/openshift-installer that referenced this pull request Sep 6, 2018
@wking
pkg/types/installconfig: Drop DNSServer
285f7b5 
Catching up with 13a7dbb (Remove the 'dns' options from libvirt,
2018-08-26, openshift#214).
@steveej
Copy link
Contributor

steveej commented Sep 6, 2018

gotta do: GOBIN=~/.terraform.d/plugins go get -u github.com/dmacvicar/terraform-provider-libvirt

Thanks that helped!

@wking wking mentioned this pull request Sep 6, 2018
Merged
@eparis eparis deleted the dns-changes branch February 18, 2019 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@abhinavdahiya abhinavdahiya Awaiting requested review from abhinavdahiya

@yifan-gu yifan-gu Awaiting requested review from yifan-gu

@crawford crawford Awaiting requested review from crawford

Assignees

@crawford crawford

@abhinavdahiya abhinavdahiya

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@eparis @abhinavdahiya @crawford @openshift-ci-robot @steveej @openshift-merge-robot