Ensure any missing controller config is added when restoring from backup #7442

Merged
merged 1 commit into from Jun 2, 2017

Conversation

Projects
None yet
3 participants
Owner

wallyworld commented Jun 2, 2017

Description of change

When restoring a system originally bootstrapped with an older Juju, there may be new controller config attributes not originally present in the older Juju. This caused a panic. Restore now ensures any necessary default controller attributes are filled in as needed.

QA steps

Follow steps in bug.
Deploy Juju 2.1.3
Upgrade to 2.2
Take backup
Kill controller
Restore from backup

Bug reference

https://bugs.launchpad.net/juju/+bug/1688635

Owner

wallyworld commented Jun 2, 2017

$$merge$$

Contributor

jujubot commented Jun 2, 2017

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

@jujubot jujubot merged commit 6d55ec8 into juju:develop Jun 2, 2017

1 check passed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment