/juju

Lxd master merge #4314

Merged
merged 179 commits into from Feb 8, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
@tych0
Contributor

tych0 commented Feb 5, 2016

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

howbazaar and others added some commits Dec 11, 2015

@howbazaar
Read only user check framework in place.
5910022
@howbazaar
move the file to the right place
67ce605
@howbazaar
Known read only calls, and test.
b5760f8
@howbazaar
Add tests and hook up.
2e77842
@mattyw
apiserver/metricsdebug: Added a new metricsdebug facade and a GetMetr… 
…ics implementation
6ab86b4
@howbazaar
Merge branch 'master' into read-only-facade-check
431146b
@mattyw
api/metricsdebug: Client for the metricsdebug facade
1e29f2b
@mattyw
api/metricsdebug: Added non mock tests
cb6fb5e
@mattyw
state/metrics: Added tests for getting by unit
53e2ebf
@mattyw
state/metrics: Add metric query by service name
5b4da9e
@alesstimec
Removed collect metrics manifold dependency on the apicaller.
3a3a366
@mattyw
apiserver,api/metricsdebug: Comments from review
b6f192d
@mattyw
cmd/debugmetrics: Addeda metrics debug command
5774a64
@mattyw
cmd/metricsdebug: Added support for json output
5840190
@jujubot
Merge pull request #4096 from alesstimec/ecotools-core-updates-01 
Ecotools core updates 01



(Review request: http://reviews.vapour.ws/r/3517/)
7ae1c48
@mattyw
cmd/metricsdebug: comments after first round of reviews
1f72ebe
@howbazaar
Merge branch 'master' into read-only-facade-check
19df850
@jujubot
Merge pull request #4111 from alesstimec/worker-metrics-collect-chang… 
…es-01

Removed collect metrics manifold dependency on the apicaller.



(Review request: http://reviews.vapour.ws/r/3533/)
aa5b29b
@mattyw
cmd/metricsdebug: Added test for invalid unit or service
94da939
@jujubot
Merge pull request #4074 from mattyw/12-metric-debug-facade-cmd 
cmd/debugmetrics: Added a metrics debug command

Depends on #3967 

(Review request: http://reviews.vapour.ws/r/3493/)
7e1af90
@alesstimec
Merge branch 'master' into ecotools-core-updates-02
c24bb90
@mattyw
state/metrics: Querying only returns local charms
9a7306f
@jujubot
Merge pull request #4140 from mattyw/13-query-batches-local-only 
state/metrics: Querying only returns local charms



(Review request: http://reviews.vapour.ws/r/3561/)
111b884
@jujubot
Merge pull request #4138 from alesstimec/ecotools-core-updates-02 
Ecotools core updates 02

Merge from the latest master to keep the ecotools branch up to date.

(Review request: http://reviews.vapour.ws/r/3559/)
3a9ed09
@alesstimec
Fixes metricsdebug tests.
5652a1e
@jujubot
Merge pull request #4168 from alesstimec/cmd-juju-metricsdebug-test-fix 
Fixes metricsdebug tests.

Test were failing using go 1.5.2. This fixes test failures.

(Review request: http://reviews.vapour.ws/r/3594/)
cfa23c4
@alesstimec
Refactoring the collect metrics manifold.
3729897
@alesstimec
Refactored the collect metrics mechanism.
31889c7
@alesstimec
Implementation of the juju collect-metrics command.
ef5ed68
Flatten all machine commands 
For example: "juju machine add" changes to "juju add-machine"
2598f05
Flatten service command 
juju service add-unit -> juju add-unit
juju service get -> juju get-config
juju service set -> juju set-config
juju service unset -> juju set-config --to-default
juju service get-constraints -> juju get-constraints
juju service set-constraints -> juju set-constraints
bed6b3b
Flatten service command
0178083
Two new machine commands: show-machine and list-machines
f6b0d86
gofmt updates
72c9e91
Add unit tests for show-machine and list-machine commands
6af49d8
Clean-up init for show-machine command
641b767
gofmt for cmd/juju/commands/main_test.go
5581805
rebase off master
20396d7
gofmt needed on list_test.go
340379e
Add comments
b849d8c
@alesstimec
Fix wrt comments from cmars.
ed23275
@jujubot
Merge pull request #4169 from alesstimec/collect-metrics-refactor-02 
Refactoring the collect metrics manifold.



(Review request: http://reviews.vapour.ws/r/3595/)
778af5f
Flatten and rename authorized-key commands to: add-ssh-key, remove-ss… 
…h-key, import-ssh-key and list-ssh-key
9e75863
@alesstimec
MetricsDebug set meter status.
74e1d16
@alesstimec
Interface fix.
a8b18db
@jujubot
Merge pull request #4224 from alesstimec/apiserver-set-meter-status 
MetricsDebug set meter status.



(Review request: http://reviews.vapour.ws/r/3662/)
cbd53a0
@alesstimec
API set meter status.
c12e1a1
@jujubot
Merge pull request #4226 from alesstimec/api-set-meter-status 
api - set meter status



(Review request: http://reviews.vapour.ws/r/3664/)
1829b2e
@cmars
Merge commit '9a3fb53ceadc8ea9ffa4ea796b3c3150c03b224b' into ecotools… 
…-pull-upstream
278284b
@jujubot
Merge pull request #4231 from cmars/ecotools-pull-upstream 
Merge master -> ecotools

Merging [latest blessed master](http://reports.vapour.ws/releases/3545) into ecotools-refactor feature branch.

(Review request: http://reviews.vapour.ws/r/3670/)
0e32701
@mattyw
cmd/setmeterstatus: Added set meter status command
2dd3382
@alesstimec
Fixes windows tests.
a0626d0
@jujubot
Merge pull request #4225 from mattyw/15-set-meter-status-cmd 
cmd/setmeterstatus: Added set meter status command



(Review request: http://reviews.vapour.ws/r/3663/)
4cdbd83
@jujubot
Merge pull request #4240 from alesstimec/socket-listener-fix-01 
Fixes windows tests.



(Review request: http://reviews.vapour.ws/r/3680/)
5732f47
@cmars
Sprint prep.
2edc638
Add support for EC2 region ap-northeast-2 
Change for master, as landed on 1.25 branch.

New AWS region in Korea. Updates to newer amz.v3 revision
for endpoints, and adds instance-type/pricing information
to the EC2 provider.

Drive-by update to eu-central-1 pricing and instance types.
0b212cf
@jujubot
Merge pull request #4243 from cmars/sprint-prep 
Sprint prep.



(Review request: http://reviews.vapour.ws/r/3682/)
c4cc0d2
@mattyw
cmd/deploy: Fixed urls for deploy steps
6abf727
@jujubot
Merge pull request #4254 from mattyw/default-plan-fix 
cmd/deploy: Fixed urls for deploy steps



(Review request: http://reviews.vapour.ws/r/3692/)
23d1c17
merge flatten_sshkey_commands w/ api_rename branch
7531392

jujubot and others added some commits Feb 5, 2016

@jujubot
Merge pull request #4299 from AlexisBruemmer/flatten_machine_and_serv… 
…ice_commands

Flatten machine and service commands

New Command Format:

machines - list machines in a model
list-machines - list machines in a model
add-machine - adds machine to a model
remove-machine - removes a machine from a model
show-machine - shows details on a machine

get-config - gets the config values for a service
set-config - sets the config value for a service
get-constraints - gets the constraints for a service
set-constraints - sets the constraints for a service
add-unit - add unit[s] to a service
remove-unit - remove unit from a service
2022e50
@jujubot
Merge pull request #4119 from mjs/env-migration-state 
model migration state infrastructure

This change introduces functionality in state to manage a few new model migration related collections. It also introduces some related functionality in core/modelmigrations to define migration phases and the transitions between them.

These changes are reliant on the machine-dep-engine feature branch and can't land in master until it has landed. (The diff on Reviewboard is correct however)

(Review request: http://reviews.vapour.ws/r/3541/)
e4081dc
@howbazaar
Make the tests pass.
96605a5
@howbazaar
Add a test that checks the read only calls actually exist.
0b3c34a
@howbazaar
Fix the wrong calls.
2f3d54c
@jujubot
Merge pull request #4296 from AlexisBruemmer/flatten_sshkey_commands 
Flatten authorized-key commands

New Commands Are:

list-ssh-keys (alias ssh-keys)
add-ssh-key
remove-ssh-key
import-ssh-key

Both plural and singular forms of the command work (ie ssh-key and ssh-keys list keys); these have been manually tested on a local lxd model. 

(Review request: http://reviews.vapour.ws/r/3738/)
9ff7ada
@jujubot
Merge pull request #4003 from howbazaar/read-only-facade-check 
Read only facade check

When an environment user has only read access to the environment, the apiserver adds an extra method lookup filter.

The read only check has been kept quite separate from the user lookup as the read only code will also be used for model migrations.
0296a83
@davecheney
cmd: report compiler version, not just flavor 
With the advent of Go 1.5 and newer on some build servers it is important
to record the _version_ of the compiler, not simply its flavour: gc or gccgo.
addc06e
@jujubot
Merge pull request #4290 from davecheney/report-compiler-version 
cmd: report compiler version, not just flavor

With the advent of Go 1.5 and newer on some build servers it is important
to record the _version_ of the compiler, not simply its flavour: gc or gccgo.

(Review request: http://reviews.vapour.ws/r/3732/)
a12a70c
@wallyworld
Rename Service facade methods: ServiceFoo becomes Foo
61a5540
@wallyworld
Typo
9b61213
@wallyworld
Update romulus dependency
3a92b9f
@jujubot
Merge pull request #4307 from wallyworld/rename-service-methods 
Rename Service facade methods: ServiceFoo becomes Foo

When service facade methods were on the Client facade, they needed to be called ServiceGet or ServiceDeploy etc. Now that they're on the Service facade, this is unnecessary. 

Also remove an obsolete method.

(Review request: http://reviews.vapour.ws/r/3749/)
e437afc
@jujubot
Merge pull request #4131 from tych0/bump-lxd-api 
Bump lxd api

update the version of the go LXD bindings, and update some small incompatibilities.
0f40661
@wallyworld
Remove local provider
986932b
@wallyworld
Fix tests
095352e
@wallyworld
Rebase on master, fix issues
a6019a1
@wallyworld
go fmt
454923c
@jujubot
Merge pull request #4253 from wallyworld/remove-local-provider 
Remove local provider

Ding dong the witch is dead.
This can't land until trusty has golang 1.5 and lxd in backports.

The LXC based local provider is replaced by LXD, so it is removed. As a consequence, we no longer need to namespace the mongo service name. So a bunch of other stuff is removed also.

(Review request: http://reviews.vapour.ws/r/3691/)
807a7e1
@jujubot
Merge pull request #4302 from fwereade/dependency-run-flag 
add dependency.Flag manifold wrapper

main intent is to be able to simply wrap a pre-existing manifold with one of these so we can add simple non-resource dependencies without having to rewrite all the manifold configs that already exist.

(Review request: http://reviews.vapour.ws/r/3744/)
c655490
@jujubot
Merge pull request #4244 from bz2/ap_northeast_2_master 
Add support for EC2 region ap-northeast-2

Change for master, as landed on 1.25 branch.

New AWS region in Korea. Updates to newer amz.v3 revision
for endpoints, and adds instance-type/pricing information
to the EC2 provider.

Drive-by update to eu-central-1 pricing and instance types.

(Review request: http://reviews.vapour.ws/r/3683/)
85d9f7b
Merge branch 'master' into lxd-master-merge 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
1e28322
@ericsnowcurrently
Contributor

ericsnowcurrently commented Feb 5, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Feb 5, 2016

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

jujubot commented Feb 5, 2016

Build failed: Does not match ['fixes-1542336']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6246
@cherylj

cherylj commented Feb 5, 2016

$$fixes-1542336$$
@jujubot
Contributor

jujubot commented Feb 5, 2016

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

jujubot commented Feb 5, 2016

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6249
restrict lxd container type to go1.3 
natefinch | tych0: the landing bot runs go 1.2, which means we have to mark
all LXD code as // +build go1.3  so it only builds with 1.3 or higher

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
7a21c18
@tych0
Contributor

tych0 commented Feb 5, 2016

Ok, I believe I've fixed that error as part of this branch, so perhaps it might work this time? :)
@cherylj

cherylj commented Feb 5, 2016

$$fixes-1542336$$
@jujubot
Contributor

jujubot commented Feb 5, 2016

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

jujubot commented Feb 5, 2016

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6251
add build directive to instance.go too 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
0f0d405
@cherylj

cherylj commented Feb 5, 2016

$$fixes-1542336$$
@jujubot
Contributor

jujubot commented Feb 5, 2016

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

jujubot commented Feb 5, 2016

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6252
add go 1.2 stubs for LXD 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
9e70b80
@tych0
Contributor

tych0 commented Feb 5, 2016

$$merge$$
@cherylj

cherylj commented Feb 5, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Feb 5, 2016

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

jujubot commented Feb 6, 2016

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6257
use real build tag for <1.3 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
ce674ee
@tych0
Contributor

tych0 commented Feb 8, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Feb 8, 2016

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

jujubot commented Feb 8, 2016

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6270
fix compiler error w/ go1.2 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
3b6c155
@tych0
Contributor

tych0 commented Feb 8, 2016

$$merge$$
@tych0
Contributor

tych0 commented Feb 8, 2016

At some point I should probably install a go1.2 compiler...
@jujubot
Contributor

jujubot commented Feb 8, 2016

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

jujubot commented Feb 8, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6271
lxd: blacklist some tests on go1.2 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
21c9765
@tych0
Contributor

tych0 commented Feb 8, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Feb 8, 2016

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

jujubot commented Feb 8, 2016

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6272
fix go fmt 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
495a787
@tych0
Contributor

tych0 commented Feb 8, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Feb 8, 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 Feb 8, 2016

@jujubot
Merge pull request #4314 from tych0/lxd-master-merge 
Lxd master merge



(Review request: http://reviews.vapour.ws/r/3756/)
2be2e05

@jujubot jujubot merged commit 2be2e05 into juju:lxd-container-type Feb 8, 2016

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