Merge pull request #1906 from wallyworld/fix-certs-on-boot #1907

Merged
merged 1 commit into from Mar 23, 2015

Conversation

Projects
None yet
2 participants
Owner

wallyworld commented Mar 23, 2015

Fix server cert on machine agent startup

Fixes: https://bugs.launchpad.net/bugs/1434680

This fix contains the 1.22 fix done by Menno plus new work required for 1.23.
The 1.22 fix ensures that when the state server certificate is updated, its DNSNames contains "local" and "juju-apiserver" and "juju-mongodb".

This 1.23 fix extends that by upgrading the state server cert as soon as the machine agent starts. This is because of an unrelated piece of work which updates the mongo upstart conf and caused mongo to restart. So this fix needs to occur right at the start of the machine agent startup, before EnsureServer() is called.

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

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

Merge pull request #1906 from wallyworld/fix-certs-on-boot
Fix server cert on machine agent startup

Fixes: https://bugs.launchpad.net/bugs/1434680

This fix contains the 1.22 fix done by Menno plus new work required for 1.23.
The 1.22 fix ensures that when the state server certificate is updated, its DNSNames contains "local" and "juju-apiserver" and "juju-mongodb".

This 1.23 fix extends that by upgrading the state server cert as soon as the machine agent starts. This is because of an unrelated piece of work which updates the mongo upstart conf and caused mongo to restart. So this fix needs to occur right at the start of the machine agent startup, before EnsureServer() is called.

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

wallyworld commented Mar 23, 2015

$$fixed-1434680$$

Contributor

jujubot commented Mar 23, 2015

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

Contributor

jujubot commented Mar 23, 2015

Build failed: Does not match ['fixes-1434544', 'fixes-1434680']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/2601

Owner

wallyworld commented Mar 23, 2015

$$fixes-1434680$$

Contributor

jujubot commented Mar 23, 2015

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

Contributor

jujubot commented Mar 23, 2015

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/2602

Owner

wallyworld commented Mar 23, 2015

$$fixes-1434680$$

Contributor

jujubot commented Mar 23, 2015

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

Contributor

jujubot commented Mar 23, 2015

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/2603

Owner

wallyworld commented Mar 23, 2015

$$fixes-1434680$$

Contributor

jujubot commented Mar 23, 2015

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

Contributor

jujubot commented Mar 23, 2015

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/2605

Owner

wallyworld commented Mar 23, 2015

$$fixes-1434680$$

Contributor

jujubot commented Mar 23, 2015

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 23, 2015

Merge pull request #1907 from wallyworld/fix-certs-on-boot-master
Merge pull request #1906 from wallyworld/fix-certs-on-boot

Fix server cert on machine agent startup

Fixes: https://bugs.launchpad.net/bugs/1434680

This fix contains the 1.22 fix done by Menno plus new work required for 1.23.
The 1.22 fix ensures that when the state server certificate is updated, its DNSNames contains "local" and "juju-apiserver" and "juju-mongodb".

This 1.23 fix extends that by upgrading the state server cert as soon as the machine agent starts. This is because of an unrelated piece of work which updates the mongo upstart conf and caused mongo to restart. So this fix needs to occur right at the start of the machine agent startup, before EnsureServer() is called.

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

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

@jujubot jujubot merged commit 0752a4b into juju:master Mar 23, 2015

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