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

Remove sshfs install from cloud-init #619

Merged
merged 5 commits into from
Mar 4, 2019
Merged

Conversation

townsend2010
Copy link
Contributor

Also move "just in time" sshfs install logic into the daemon.

Fixes #615

@townsend2010 townsend2010 force-pushed the remove-sshfs-cloud-init branch 2 times, most recently from f494c36 to fb6ace1 Compare February 22, 2019 09:15
@Saviq
Copy link
Collaborator

Saviq commented Feb 28, 2019

@townsend2010 this needs a conflict resolve

Chris Townsend added 3 commits February 28, 2019 09:27
This will no longer do 'apt update' and install 'sshfs' inside the instance
during cloud-init and thus, will speed up 'launch'.

Fixes #615
The client (and user) no longer need to wait for cloud-init to finish in the
instance since cloud-init no longer installs sshfs.
@townsend2010 townsend2010 force-pushed the remove-sshfs-cloud-init branch from fb6ace1 to ea5d56b Compare February 28, 2019 14:40
@townsend2010
Copy link
Contributor Author

Ok, merge conflict resolved and is ready for review:)

@ricab
Copy link
Collaborator

ricab commented Mar 1, 2019

bors try

bors bot added a commit that referenced this pull request Mar 1, 2019
@ricab ricab self-requested a review March 1, 2019 11:53
@bors
Copy link
Contributor

bors bot commented Mar 1, 2019

try

Build failed

Copy link
Collaborator

@ricab ricab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some requests and questions

src/client/cmd/start.cpp Outdated Show resolved Hide resolved
src/client/cmd/mount.cpp Outdated Show resolved Hide resolved
src/client/cmd/start.cpp Show resolved Hide resolved
src/client/cmd/start.cpp Show resolved Hide resolved
src/daemon/daemon.cpp Show resolved Hide resolved
src/daemon/daemon.cpp Outdated Show resolved Hide resolved
src/daemon/daemon.cpp Outdated Show resolved Hide resolved
src/rpc/multipass.proto Show resolved Hide resolved
@ricab
Copy link
Collaborator

ricab commented Mar 1, 2019

bors r+

bors bot added a commit that referenced this pull request Mar 1, 2019
619: Remove sshfs install from cloud-init r=ricab a=townsend2010

Also move "just in time" sshfs install logic into the daemon.

Fixes #615 

Co-authored-by: Chris Townsend <[email protected]>
@bors
Copy link
Contributor

bors bot commented Mar 1, 2019

Build failed

@ricab
Copy link
Collaborator

ricab commented Mar 1, 2019

It seems the method removal needs to be propagated to hyperkit: https://travis-ci.org/CanonicalLtd/multipass/jobs/500462368#L3975

I suppose the windows one too?

@townsend2010
Copy link
Contributor Author

townsend2010 commented Mar 1, 2019

@ricab,

Yes, that occurs when we merge master into the full branch in that it is a manual process.

@ricab
Copy link
Collaborator

ricab commented Mar 4, 2019

@townsend2010 delegating as I am not sure what's best in face of bors failing.

bors delegate=townsend2010

@bors
Copy link
Contributor

bors bot commented Mar 4, 2019

✌️ townsend2010 can now approve this pull request

@townsend2010 townsend2010 merged commit 9806c08 into master Mar 4, 2019
@bors bors bot deleted the remove-sshfs-cloud-init branch March 4, 2019 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants