This repository has been archived by the owner on Sep 26, 2021. It is now read-only.
Provisioner upgrade #920
Merged
Provisioner upgrade #920
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
Signed-off-by: Nathan LeClaire <[email protected]>
Signed-off-by: Nathan LeClaire <[email protected]>
|
Thanks! Taking a look. |
| @@ -167,7 +155,7 @@ func (h *Host) Start() error { | |||
| return err | |||
| } | |||
|
|
|||
| return utils.WaitFor(h.MachineInState(state.Running)) | |||
| return utils.WaitFor(drivers.MachineInState(h.Driver, state.Running)) | |||
There was a problem hiding this comment.
This is starting to get clunky. I'm not saying it's bad - it just seems getting a bit much with the nesting. Not sure what to do.
There was a problem hiding this comment.
Yeah I agree it's hairy. Maybe we could have an additional short-hand method available in utils, like utils.WaitForDriverState(h.Driver, state.Running). I just don't want to re-implement "run an action, then wait for the state that action is trying to reach to be fulfilled" in different places.
There was a problem hiding this comment.
I agree -- I think it's ok for now.
|
LGTM |
legal90
added a commit
to legal90/machine
that referenced
this pull request
Mar 31, 2015
Signed-off-by: Mikhail Zholobov <[email protected]>
legal90
added a commit
to legal90/machine
that referenced
this pull request
Apr 1, 2015
Signed-off-by: Mikhail Zholobov <[email protected]>
legal90
added a commit
to legal90/machine
that referenced
this pull request
Jun 8, 2015
Signed-off-by: Mikhail Zholobov <[email protected]>
legal90
added a commit
to legal90/machine
that referenced
this pull request
Jun 22, 2015
Signed-off-by: Mikhail Zholobov <[email protected]>
legal90
added a commit
to legal90/machine
that referenced
this pull request
Jul 14, 2015
Signed-off-by: Mikhail Zholobov <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
cc @ehazlett @sthulb
This PR implements upgrade feature for the Ubuntu and boot2docker provisioners. In Ubuntu we run
sudo apt-get upgrade lxc-dockerand for boot2docker we download the latest ISO, then replace the one the machine is currently using with that ISO.Noteworthy changes:
WaitForStatehas been pulled intodriversinstead oflibmachinein order to make it easier to use cross-packagevirtualboxdriver and intoutilsso it can be used in multiple places. Come to think of it, maybe I should go update the other local drivers to use this common code as well?PTAL