/juju

bootstrap: fix authorized-keys in hosted model #4844

Merged
merged 1 commit into from Mar 22, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@axw @jujubot
@axw
Member

axw commented Mar 22, 2016

If --config contains authorized-keys, the system
key will not be added to the initial hosted model's
config. This is because authorized-keys is modified
in the admin model config, but that value is not
copied over to the hosted model config as it is
already present.

(Review request: http://reviews.vapour.ws/r/4284/)
@axw
bootstrap: fix authorized-keys in hosted model 
If --config contains authorized-keys, the system
key will not be added to the initial hosted model's
config. This is because authorized-keys is modified
in the admin model config, but that value is not
copied over to the hosted model config as it is
already present.

Fixes https://bugs.launchpad.net/juju-core/+bug/1461561
f5f9e6b
@axw
Member

axw commented Mar 22, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 22, 2016

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

jujubot added a commit that referenced this pull request Mar 22, 2016

@jujubot
Merge pull request #4844 from axw/bootstrap-authorized-keys 
bootstrap: fix authorized-keys in hosted model

If --config contains authorized-keys, the system
key will not be added to the initial hosted model's
config. This is because authorized-keys is modified
in the admin model config, but that value is not
copied over to the hosted model config as it is
already present.

(Review request: http://reviews.vapour.ws/r/4284/)
675a712

@jujubot jujubot merged commit 675a712 into juju:admin-controller-model Mar 22, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment