Vagrant fixups #32067
Merged
Vagrant fixups #32067
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
September 5, 2016 02:29
…agrant 1.8.5 Signed-off-by: Erik Hollensbe <[email protected]>
Signed-off-by: Erik Hollensbe <[email protected]>
|
Can a kubernetes member verify that this patch is reasonable to test? If so, please reply "ok to test". Regular contributors should join the org to skip this step. |
k8s-github-robot
added
size/XS
|
Oh sorry, I forgot to mention that while verifying the code I found two unused variables near the bottom, I took the liberty of removing them. |
| @@ -293,8 +299,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| | |||
| # Kubernetes node | |||
| $num_node.times do |n| | |||
| node_vm_name = "node-#{n+1}" | |||
| node_prefix = ENV['INSTANCE_PREFIX'] || 'kubernetes' # must mirror default in cluster/vagrant/config-default.sh | |||
There was a problem hiding this comment.
why are you deleting this?
There was a problem hiding this comment.
Ah, I saw your second comment...
|
@k8s-bot ok to test |
brendandburns
added
release-note
|
LGTM |
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
GCE e2e build/test passed for commit eec97a7. |
|
Automatic merge from submit-queue |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Vagrant 1.8.5 contains a bug where it does not insert a newly generated private key into the VM correctly. This prevents usage by both provisioners and the vagrant subsystem itself, essentially bricking the VM.
See hashicorp/vagrant#7760 for some more information.
Which issue this PR fixes (optional, in
fixes #<issue number>(, #<issue_number>, ...)format, will close that issue when PR gets merged): fixes #I honestly haven't searched; this is something I encountered setting it up.
Special notes for your reviewer:
I'm a new contributor so please be kind, happy to do anything that's required though!
Release note:
This change is