Merge master into next #5130

Merged

jujubot merged 61 commits into juju:next from dimitern:next-merge-master

Apr 13, 2016

Contributor

dimitern commented Apr 13, 2016

No description provided.

dooferlad and others added some commits Mar 31, 2016


      ProxyUpdater has been updated to use its own API and watches for chan…

…ges in both HostAPIPorts and Environ/ModelConfig. The proxy config always includes API servers in the no proxy list to prevent charms from trying to download from the API servers via the proxy, which doesn't work.

This is a port of https://github.com/juju/juju/pull/4913/files with some changes needed to fit into Juju 2.0 and, I think, needs another review.

8fa7057


      Auth for unit agent allowed for proxyupdater because that is what we …

…get when we are launched by the dep engine.

(cherry picked from commit c61e3f4)

33bf650


      A bunch of changes based on review.

9baa363


      Minor fixups.

9295c08


      More fixes based on review.

de4f371


      ProxyConfig API ready to be a proper bulk call when needed.

6b38cdb


      More review fixes

0b69bea


      Fix up merge errors

7f876b4


      Updated no-change message to upbeat.

76d486b


      1569024: Do case-insensitive region comparison

When comparing a specified region to the regions
specified for the cloud, use a case insensitive
comparison.

4dcd754


      1569024: Set case-insensitive regions

Updated set-default-region to do a case-
insensitive comparison, but to use the
region as it is defined in the cloud.

0f6f6c5


      Fix mongo set up so it works with ha

c5993b6


      Delete more old code

9eedb0f


      Fix tests

6c67ca3


      Controller agents ignore jobmanagenetworking

8646d5f


      Moved fake watcher out into its own file in workertest.

A few more changes based on review.

ef16fc1


      Merge pull request #5088 from wallyworld/fix-enable-ha-mongo3

Fix mongo set up so it works with ha

Fixes: https://bugs.launchpad.net/juju-core/+bug/1569097

The jujud bootstrap command writes mongo version to agent.conf. However, when starting new machines for HA, the agent.conf does not have the mongo version set since we are not bootstrapping.

The mongo version handing is changed so that it is not done by bootstrap by instead when the machine agent starts. We also remove a bunch of legacy code which complicated mongo set up and only existed to upgrade old pre-HA environments (1.16 and earlier).

Tested with LXD. Ran ensure-ha -n 3 and verified that the new state servers eventually were recorded as has-vote.


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

9c4c95d


      Merge pull request #5085 from cherylj/rackspace-regions

1569024: Do case-insensitive region comparison

When comparing a specified region to the regions
specified for the cloud, use a case insensitive
comparison.

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

cfc8d4c


      Final changes after final review of finality.

f6f57ed


      Merge pull request #4964 from dooferlad/master-proxy-state-server-bug

State server access shouldn't go through the HTTP[S] proxy

ProxyUpdater has been updated to use its own API and watches for changes in both HostAPIPorts and Environ/ModelConfig. The proxy config always includes API servers in the no proxy list to prevent charms from trying to download from the API servers via the proxy, which doesn't work.

This is a port of https://github.com/juju/juju/pull/4913/files with some changes needed to fit into Juju 2.0 and, I think, needs another review.

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

ec79b8e


      new images against 1.25

91f00f7


      Added bether fallbacks and fixed path.

f383566


      Remove ensureAdminuser and use correct path for mongo tools

90481c6


      Internal tests, avoid export_test.

a62c6cc


      Fix tests

9c57efd


      Review comments.

a77f1a7


      Simplify code - remove duplication.

f512c98


      Refactored func to create regions map.

2fc6e81


      Merge pull request #5123 from wallyworld/use-correct-mongotools

Remove ensureAdminuser and use correct path for mongo tools

We don't need ensureAdminUser.
Fixed path used to locate mongo tools.

Tested with LXD - can bootstrap and backup both xenial and trusty.
Restore on xenial has issues due to packaging.

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

ae35ee9


      Merge pull request #5124 from wallyworld/fix_1569408

Fix 1569408

Based on http://reviews.vapour.ws/r/4552/

Fixes a couple of tests.

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

f0ca8cc


      Merge pull request #5118 from anastasiamac/update-clouds-msg-bug1563843

Fixes bug 1563843: update-clouds feedback includes changes summary and details.

Currently, update-clouds commands tells user that the updates have been applied.

This PR provides more information about what changed on your list of public clouds.

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

794af6e


      Merge pull request #5096 from wallyworld/controllers-ignore-jobmanage…

…networking

Controller agents ignore jobmanagenetworking

Fixes: https://bugs.launchpad.net/juju-core/+bug/1569196

When converting a machine to a controller, if the machine has been configured with JobManageNetworking, the agent startup would fail as that job type is not used by state server workers.

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

807e1fc


      Fixed lp:1569725: proxyupdater api facade omits NotifyWatcherId from …

…response

eabf441


      Fix mongo set up so it works with ha

a9fb7fe


      Updated no-change message to upbeat.

e36bbec


      ProxyUpdater has been updated to use its own API and watches for chan…

…ges in both HostAPIPorts and Environ/ModelConfig. The proxy config always includes API servers in the no proxy list to prevent charms from trying to download from the API servers via the proxy, which doesn't work.

This is a port of https://github.com/juju/juju/pull/4913/files with some changes needed to fit into Juju 2.0 and, I think, needs another review.

357ea59


      Auth for unit agent allowed for proxyupdater because that is what we …

…get when we are launched by the dep engine.

(cherry picked from commit c61e3f4)

b250c40


      A bunch of changes based on review.

d735c7e


      Minor fixups.

8cb7c1e


      More fixes based on review.

281b526


      ProxyConfig API ready to be a proper bulk call when needed.

131df38


      More review fixes

ac04dcf


      Fix up merge errors

9721a4f


      1569024: Do case-insensitive region comparison

When comparing a specified region to the regions
specified for the cloud, use a case insensitive
comparison.

31eb3fa


      1569024: Set case-insensitive regions

Updated set-default-region to do a case-
insensitive comparison, but to use the
region as it is defined in the cloud.

aa739f8


      Delete more old code

abc418f


      Fix tests

88f6707


      Moved fake watcher out into its own file in workertest.

A few more changes based on review.

e78473c


      Final changes after final review of finality.

e785075


      Added bether fallbacks and fixed path.

bd2d0cb


      new images against 1.25

cd13111


      Remove ensureAdminuser and use correct path for mongo tools

693710d


      Internal tests, avoid export_test.

f478ae8


      Fix tests

cac9eb2


      Review comments.

f2fc62b


      Controller agents ignore jobmanagenetworking

f050cec


      Simplify code - remove duplication.

d1580a5


      Refactored func to create regions map.

8aa810a


      Fixed a test

a576bef


      Merge pull request #5126 from dimitern/fix-proxyupdater-watcher

Fixed lp:1569725: proxyupdater api facade omits NotifyWatcherId from response

See http://pad.lv/1569725 for more info.
Live tested on MAAS.

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

e792146


      Forward port the fix proxyupdater

5141ef0

Contributor

dimitern commented Apr 13, 2016

$$merge$$

Contributor

jujubot commented Apr 13, 2016

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

jujubot merged commit `57735cc` into juju:next Apr 13, 2016

dimitern deleted the dimitern:next-merge-master branch Apr 13, 2016

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

You can't perform that action at this time.