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

Prevent docker load. #6471

Merged
merged 1 commit into from
Apr 6, 2015
Merged

Conversation

ArtfulCoder
Copy link
Contributor

This logic will be added back later at a point where docker installation is done by salt.

@ArtfulCoder
Copy link
Contributor Author

#6465
@zmerlynn

@ArtfulCoder
Copy link
Contributor Author

@dchen1107

@zmerlynn
Copy link
Member

zmerlynn commented Apr 6, 2015

LGTM

@zmerlynn zmerlynn added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 6, 2015
ArtfulCoder added a commit that referenced this pull request Apr 6, 2015
@ArtfulCoder ArtfulCoder merged commit 46370bc into kubernetes:master Apr 6, 2015
@dchen1107
Copy link
Member

cc/ @derekwaynecarr

Sorry for breaking vagrant again. Derek, @ArtfulCoder did try to test the vagrant setup for etcd in pod, but failed even without his change by following kubernetes/docs/getting-started-guides/vagrant.md. We are going to definitely include vagrant into our test metrics, but need to clean up startup guide first. Can we have your help on this? Thanks!

@zmerlynn
Copy link
Member

zmerlynn commented Apr 6, 2015

@dchen1107: If you're looking for some Google-side help, @fabioy recently came back from vacation, and has setup Vagrant previously. He might be able to help.

@derekwaynecarr
Copy link
Member

@dchen1107 - i will test vagrant again now that this merged. i know it worked when i left on thurs, and was broken when i came back today, so something could have happened in interim aside from this.

@derekwaynecarr
Copy link
Member

@dchen1107 - so i tested after this PR merged and was able to bring up a k8s cluster on vagrant using a master and single minion. i will keep an eye out if there are any intermittent failures through week to see if there is something i can fix on my end.

@ArtfulCoder - thanks for the quick fix on this issue ;-)

@dchen1107
Copy link
Member

@derekwaynecarr If this model works fine for you, I am fine with it. My concern is that we are keeping breaking vagrant setup, which we tried hard to avoid. The problem we couldn't avoid is lacking of automate system bringing a vagrant cluster for us to validate our changes. Thanks for quick validate the issues for us.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants