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

terraform/plugins: update libvirt provider #2786

Merged
merged 1 commit into from Dec 11, 2019
Merged

terraform/plugins: update libvirt provider #2786

merged 1 commit into from Dec 11, 2019

Conversation

crawford
Copy link
Contributor

This pulls in some upstream changes 1 that add support for providing
Ignition configs to s390x guests. This doesn't require any changes to
the Terraform templates, but it does require Ignition to be run with
--provider=openstack on s390x (there is no support for the QEMU
firmware configuration device on s390x, so the OpenStack config-drive is
used instead).

This pulls in some upstream changes [1] that add support for providing
Ignition configs to s390x guests. This doesn't require any changes to
the Terraform templates, but it does require Ignition to be run with
`--provider=openstack` on s390x (there is no support for the QEMU
firmware configuration device on s390x, so the OpenStack config-drive is
used instead).

[1]: dmacvicar/terraform-provider-libvirt#678
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 10, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 10, 2019
@abhinavdahiya
Copy link
Contributor

The bump looks okay to me.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 10, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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:
  • 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

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 1201aee into openshift:master Dec 11, 2019
@crawford
Copy link
Contributor Author

/cherry-pick release-4.3
/cherry-pick release-4.2

@openshift-cherrypick-robot

@crawford: new pull request created: #2803

In response to this:

/cherry-pick release-4.3
/cherry-pick release-4.2

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.

@crawford
Copy link
Contributor Author

/cherry-pick release-4.2

@openshift-cherrypick-robot

@crawford: #2786 failed to apply on top of branch "release-4.2":

Using index info to reconstruct a base tree...
M	pkg/terraform/exec/plugins/Gopkg.lock
M	pkg/terraform/exec/plugins/Gopkg.toml
M	pkg/terraform/exec/plugins/vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/domain.go
M	pkg/terraform/exec/plugins/vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/resource_libvirt_domain.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/terraform/exec/plugins/vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/resource_libvirt_domain.go
CONFLICT (content): Merge conflict in pkg/terraform/exec/plugins/vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/resource_libvirt_domain.go
Auto-merging pkg/terraform/exec/plugins/vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/domain.go
CONFLICT (content): Merge conflict in pkg/terraform/exec/plugins/vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/domain.go
Auto-merging pkg/terraform/exec/plugins/Gopkg.toml
CONFLICT (content): Merge conflict in pkg/terraform/exec/plugins/Gopkg.toml
Auto-merging pkg/terraform/exec/plugins/Gopkg.lock
CONFLICT (content): Merge conflict in pkg/terraform/exec/plugins/Gopkg.lock
error: Failed to merge in the changes.
Patch failed at 0001 terraform/plugins: update libvirt provider

In response to this:

/cherry-pick release-4.2

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.

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants