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

Fixes lp#1576003: Double default bootstrap timeout for maas. #5638

Merged
merged 4 commits into from Jun 17, 2016

Conversation

anastasiamac
Copy link
Contributor

@anastasiamac anastasiamac commented Jun 16, 2016

Bootstrap-timeout is a duration that is highly provider specific.

We do well with common timeout defaults on all providers except for MAAS. Juju users bootstraping on MAAS have to overwrite default time in configuration for each controller deployment. More details in the bug.

This PR improves user experience with Juju on MAAS.

(Review request: http://reviews.vapour.ws/r/5082/)

…y: use user provided when a user supplies one; otherwise use MAAS provider specific default whcih is different to all other providers default.

Added tests to check:
1. When bootstrap timeout is not specified, a default is used;
2. When user specifies bootstrap timeout that value is used;
3. and user specified value is used even if it's less than MAAS default value.
@anastasiamac
Copy link
Contributor Author

$$JFDI$$

@jujubot
Copy link
Collaborator

jujubot commented Jun 17, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit e8e4026 into juju:master Jun 17, 2016
@anastasiamac anastasiamac deleted the maas-bootstrap-default-lp1576003 branch June 17, 2016 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants