all: restructure instancecfg #5518
Merged
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
We restructure instancecfg.InstanceConfig such that the common, controller-specific, and bootstrap-specific parts are separated. We also define a structure in instancecfg that is serialised and sent through to the bootstrap agent, which can deserialise it into the same format. This will simplify the task of adding bootstrap-agent parameters. These changes shook out a couple of bugs (filed), and some inappropriate uses of InstanceConfig (removed/rewritten). We no longer expect MongoInfo to be present in non-controller machines, and so we remove it from the common instance config. container/kvm was relying on InstanceConfig.Constraints, which is really inappropriate: those constraints are meant to be for initialising the state database. The CreateContainer method now takes a constraints.Value, which is passed by the provisioner from StartInstanceParams. Custom image metadata no longer needs to be written to the blob store in Mongo, so that code has been removed from cmd/jujud/bootstrap.go. Consequently, we no longer need to marshal the metadata to the on-disk format, and we can keep it in the in-memory format and avoid the simplestreams marshal/unmarshal dance we used to do.
|
Partially $$fixes-1586890$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Tests failed |
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
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.
We restructure instancecfg.InstanceConfig such that the
common, controller-specific, and bootstrap-specific parts
are separated. We also define a structure in instancecfg
that is serialised and sent through to the bootstrap agent,
which can deserialise it into the same format. This will
simplify the task of adding bootstrap-agent parameters.
These changes shook out a couple of bugs (filed), and
some inappropriate uses of InstanceConfig (removed/rewritten).
We no longer expect MongoInfo to be present in non-controller
machines, and so we remove it from the common instance config.
container/kvm was relying on InstanceConfig.Constraints,
which is really inappropriate: those constraints are meant
to be for initialising the state database. The CreateContainer
method now takes a constraints.Value, which is passed by the
provisioner from StartInstanceParams.
Custom image metadata no longer needs to be written to the
blob store in Mongo, so that code has been removed from
cmd/jujud/bootstrap.go. Consequently, we no longer need to
marshal the metadata to the on-disk format, and we can keep
it in the in-memory format and avoid the simplestreams
marshal/unmarshal dance we used to do.
(Review request: http://reviews.vapour.ws/r/4965/)