/juju

Merge master into nate-minver. #4648

Merged
merged 3,358 commits into from Mar 9, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
@kat-co
Contributor

kat-co commented Mar 8, 2016

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

ericsnowcurrently and others added some commits Feb 22, 2016

@ericsnowcurrently
Clearly state that the entity cache is optional.
91cb037
@ericsnowcurrently
Fix a typo.
07c4f99
@ericsnowcurrently
Flatten out some error handling.
fe345fa
@ericsnowcurrently
Clarify a doc comment.
f846393
@ericsnowcurrently
APIHTTPRequestExtractor -> HTTPDownloadRequestExtractor (+ cleanup).
37fbc24
@ericsnowcurrently
Fix a doc comment.
8bc29ee
@ericsnowcurrently
Add a bit more context to the retry.CallArgs fields.
31576d7
@ericsnowcurrently
Drop errorShouldNotRetry().
6e6ef85
@ericsnowcurrently
Downgrade the logging level during retry attempts.
c6295c0
@ericsnowcurrently
Do not support using the charm store resource opener without a unit.
9a2b67c
@ericsnowcurrently
OpenResourceForUnit() -> OpenResourceForUniter().
46a20fc
@jujubot
Merge pull request #4511 from ericsnowcurrently/resources-resource-ge… 
…t-from-charmstore

Download resource files from the charm store.

When a resource file is not found in the state cache (blobstore), we must download it from the charm store (for resources of "store" origin). This patch achieves that.

(Review request: http://reviews.vapour.ws/r/3878/)
3826ca3
@ericsnowcurrently
Add a charm store poller.
d2bad3a
@ericsnowcurrently
Add the Resource.Outdated field.
b79eb87
@ericsnowcurrently
Track Resource.Outdated in mongo.
9cd96f5
@ericsnowcurrently
Add fakeUnit.CharmURL().
275bc28
@ericsnowcurrently
Add resourceState.MarkOutdatedResources().
6e25576
@ericsnowcurrently
Add a global registry for agent workers.
4d15fe1
@ericsnowcurrently
Do not use a slice of pointers.
fdffd8b
@ericsnowcurrently
Add adapters for the poller worker.
ce5b9fe
@ericsnowcurrently
Register the poller worker with the machine agent.
f2e5d1d
@ericsnowcurrently
Add Resource.Outdated to the formatted resource.
9188bd3
@ericsnowcurrently
Drop "Outdated" from the formatted resource.
a09f016
@ericsnowcurrently
Drop the mongo doc Outdated field and add Persistence.SetCharmStoreRe… 
…source().
ebfe674
@ericsnowcurrently
resourceState.MarkOutdatedResources() -> .SetCharmStoreResources().
fc859fc
@ericsnowcurrently
Drop Resource.Outdated and add ServiceResources.CharmStoreResources.
c672676
@ericsnowcurrently
Add ServiceResources.Outdated().
d516ba7
@ericsnowcurrently
Clean up resourceadatapters/workers.go.
824e4c8
@ericsnowcurrently
Move the poll period to a constant.
2585cf0
@ericsnowcurrently
Factor out shouldStop().
a845890
@ericsnowcurrently
Fix the polling constant.
666ae54
@ericsnowcurrently
Drop stateWorkerFactory.
b3328f5
@ericsnowcurrently
Do not check for equality in RegisterWorker().
22bf8ee
@ericsnowcurrently
Only compare the revisions in Outdated().
4c2cabe
@ericsnowcurrently
Add a note.
93981bf
@ericsnowcurrently
Outdated() -> Updates().
6ca9b18
@ericsnowcurrently
Drop the "name" param from NewModelWorker().
060a979
@ericsnowcurrently
Drop WorkerFactory and one-registry-to-rule-them-all.
6d495c9
@ericsnowcurrently
Align the charm store resources with the service resources before fin… 
…ding updates.
cfb1d15
@jujubot
Merge pull request #4506 from alesstimec/metrics-wireformat-changes 
Moved metrics wireformat to juju/romulus.



(Review request: http://reviews.vapour.ws/r/3943/)
92294a0
@waigani
Merge branch 'master' into MADE-storageprovisioner-machine
afb3d5f
@ericsnowcurrently
Fix the state tests.
0dc95e0
@waigani
Merge branch 'master' into MADE-storageprovisioner-machine
bf80135
@jujubot
Merge pull request #4456 from ericsnowcurrently/resources-worker-poll… 
…-charm-store

Add a worker that polls the charm store for changes in resources.

There are a number of efficiencies that may be applied, but this patch gets the ball rolling.

(Review request: http://reviews.vapour.ws/r/3891/)
7545de2
@wallyworld
Include region info with built in clouds
d47fbb1
@wallyworld
Do not expect lxd provider on go 1.2
1443940
@axw
cloudconfig/sshinit: base64 encode initial script 
Yet another variation on the cloud-config sshinit
script dance. The go.crypto-based ssh client doesn't
like whitespace in the command, so we base64-encode
it and decode on the remote side.

Live-tested with both openssh- and go.crypto-based
clients.
758fd5b
@axw
Update change-user-password and create-model
486f4b7
@axw
controllers -> admins -> models
a92c388
@wallyworld
Move all controller name thunks to commands
329701f
@jujubot
Merge pull request #4502 from wallyworld/beta1-cleanup 
Include lxd in list-clouds, imrpove bootstrap help

juju list-clouds and show-clouds now includes "lxd" in the output.

bootstrap help is also improved

(Review request: http://reviews.vapour.ws/r/3939/)
b9f68d0
@jujubot
Merge pull request #4515 from axw/lp1548799-ssh-windows 
cloudconfig/sshinit: base64 encode initial script

Yet another variation on the cloud-config sshinit
script dance. The go.crypto-based ssh client doesn't
like whitespace in the command, so we base64-encode
it and decode on the remote side.

Live-tested with both openssh- and go.crypto-based
clients.

(Review request: http://reviews.vapour.ws/r/3950/)
896c4d0
@wallyworld
Fix destroy and kill commands
8b480dc
@waigani
MADE Identity File Writer 
Move the Identity File Writer worker from the machine agent runner to the dependancy engine.
c0439f8
@axw
cmd/...: update to new jujuclient API
6b3eaa9
@axw
Tidy up
8fe0bb8
@jujubot
Merge pull request #4517 from axw/jujuclient-models-per-user 
all: nest models under accounts in models.yaml

jujuclient has been updated so that models.yaml
has the following structure:

    controllers:
      <controller>:
        accounts:
          <account>:
            models: ...
            current-model: ...

The output of "list-controllers" and "show-controller"
has been updated to reflect the new structure. Listing
controllers now only shows a current model if there is
a current account for the controller.

The modelcmd package has been updated accordingly.
 - a controller command may be initialised without
   a current account, but will error if an attempt
   is made to obtain an API connection without setting
   the current account.
 - model command will fail if an attempt is made to
   set the current model, but there is no current
   account for the controller.

There is no way to identify a model for a different
account in a controller; the current account for the
controller is always assumed.

Some minor changes were made to the change-user-password
and create-model commands. The change-user-password
command no longer requires the specified user to exist
in the local jujuclient store. The create-model command
no longer uses configstore, and uses jujuclient exclusively.

(Review request: http://reviews.vapour.ws/r/3952/)
9522d3b
@axw
bootstrap: write current-controller earlier 
Write the current-controller file earlier
in the bootstrap process, so we can run
"juju status" while bootstrap is ongoing.
d520cda
@wallyworld
Initial support for autoload-crdentials command
0aa664a
@wallyworld
Merge branch 'master' into tolerant-controller-name
4daff26

jujubot and others added some commits Mar 2, 2016

@jujubot
Merge pull request #4597 from wallyworld/verbose-list-controllers 
Add detail to list-controllers --format yaml

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

juju list-controllers --format yaml now displays all the details for the yaml file

As a drive by, rename models.go to listmodels.go. And rename env stuff to model stuff. No new code, just file rename and variable renames.

(Review request: http://reviews.vapour.ws/r/4037/)
247229b
@jameinel
fix the fixes for lp bug #1545046
8086ef2
@jujubot
Merge pull request #4601 from jameinel/fix-lp1545046 
Use HasLXDSupport to fix bug #1545046

This is just Tycho's patch, but fixed for typos. (we no longer need to import runtime packages, and the name of the attribute is not exported.)

(Review request: http://reviews.vapour.ws/r/4041/)
5717cd5
@anastasiamac
Put available zone into hook context.
ee31a56
@anastasiamac
Get zone at factory construction not context.
908e435
@jujubot
Merge pull request #4596 from davecheney/resource-api-always-send-res… 
…ponse-even-during-error

resource/api: always send a response to the client

Always send a response to the client, even when an error occurs.

(Review request: http://reviews.vapour.ws/r/4036/)
939cbbf
@davecheney
state: unexport UpgradeInProgressError 
There are too many ways for juju's API server to tell the client that it
is in upgrade state. Some come from state itself, others come from the
API server interpreting other errors from other sources.

This CL is part of a pair of changes that reduce the number of ways the
API server can say it is in upgrade state. Specifically other packages
can only inspect the error they get from state with the supplied helper
method, they cannot inspect it directly.

This CL is less than ideal is state depends on apiserver/params for the
CodeUpgradeInProgress constant. But this source dependency existed
before hand, so it's not the end of the world.
95094e4
@jujubot
Merge pull request #4605 from anastasiamac/hook-context-az-lp1546790 
Fixes lp 1546790 (master): env var missing from hook context.

Availability zone environment variable was missing from hook context.

(Review request: http://reviews.vapour.ws/r/4045/)
5f67947
@davecheney
apiserver/common: cleanup errors.go 
Lots of driveby cleanups

- remove unused types
- unexport various isError helpers that were only used internally
a8111f0
@jujubot
Merge pull request #4600 from davecheney/apiserver-common-cleanup-errors 
apiserver/common: cleanup errors.go

Lots of driveby cleanups

- remove unused types
- unexport various isError helpers that were only used internally

(Review request: http://reviews.vapour.ws/r/4040/)
34557e0
@wallyworld
Add interactive autoload credentials
a465968
@wallyworld
Skip test on windows
17351d7
@wallyworld
Remove secrets by default from listed credentials
829346d
@wallyworld
Code review cleaups
611414d
@jameinel
Fix intermittent test bug #1552589. 
It was possible to change the configuration before the provisioner task
was started, and thus there was never any change to observe.
Now we always observer the initial config. It means the test itself
is slightly weaker, because sometimes we never observer the *change*,
but at least the test doesn't accidentally fail.
A better fix would be to wait to change the config until you know
that the config has already been seen. However, we can't do that
via the Observer interface, because there is a race that we
could have already started the Task before we get a chance to
set the observer.
6c74ec1
@wallyworld
Improve command constructor
97585d6
@jujubot
Merge pull request #4612 from wallyworld/autoload-credentials-part3 
Add interactive autoload credentials

juju autoload-credentials is now interactive.

openstack detection now supports ~/.novarc files

Detected credentials have a label (based on the spec) so that this can be presented to the user to allow them to make a choice as to what they want to save.

(Review request: http://reviews.vapour.ws/r/4052/)
af8944d
@wallyworld
Merge branch 'master' into hide-credential-secrets
5c0794e
@wallyworld
Fix nerge issue
2fa42f9
@jujubot
Merge pull request #4613 from wallyworld/hide-credential-secrets 
Remove secrets by default from listed credentials

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

and also

add a --show-secrets flag to list-credentials. 
Now, by default, secrets are hidden unless --show-secrets is used.

Also as a drive by, fix the --include-passwords flag for show-controller - rename to show-passwords

(Review request: http://reviews.vapour.ws/r/4053/)
08b8292
@jujubot
Merge pull request #4611 from davecheney/state-unexport-upgradeinprog… 
…ress

state: unexport UpgradeInProgressError

There are too many ways for juju's API server to tell the client that it
is in upgrade state. Some come from state itself, others come from the
API server interpreting other errors from other sources.

This CL is part of a pair of changes that reduce the number of ways the
API server can say it is in upgrade state. Specifically other packages
can only inspect the error they get from state with the supplied helper
method, they cannot inspect it directly.

This CL is less than ideal is state depends on apiserver/params for the
CodeUpgradeInProgress constant. But this source dependency existed
before hand, so it's not the end of the world.

(Review request: http://reviews.vapour.ws/r/4051/)
9cc7cb8
@anastasiamac
Forward-porting to master: passing stream to image download (fix from… 
… xnox).
a6f23c8
@anastasiamac
Added test to cover streams other than "released".
ac7ffef
@jujubot
Merge pull request #4621 from anastasiamac/stream-to-cloudimage-query… 
…-master

Forward-porting to master: passing stream to image download

#4619

Enables specifying streams in image download when calling ubuntu-cloudimage-query command. 

(Review request: http://reviews.vapour.ws/r/4061/)
e68369a
Correct help text to suggest 'juju destroy-model'
6b6c461
@davecheney
api/block: driveby cleanups 
Multi line logging, seriously ??
70e7c8b
@davecheney
Cope with typed error from params.ErrorResults.Error
4500ea4
@jujubot
Merge pull request #4401 from davecheney/api-block-driveby 
api/block: driveby cleanups

Multi line logging, seriously ??
182ecb1
@davecheney
dependencies.tsv: upgrade juju/testing 
Upgrade juju/testing to latest to pick up improvements to MgoInstance
testing suite.
9fcb1f0
@jujubot
Merge pull request #4632 from davecheney/juju-testing 
dependencies.tsv: upgrade juju/testing

Upgrade juju/testing to latest to pick up improvements to MgoInstance
testing suite.

(Review request: http://reviews.vapour.ws/r/4074/)
c157332
@jujubot
Merge pull request #4614 from jameinel/fix-lp1552589-intermittent-Tes… 
…tProvisionerObservesMachineJobs

Fix intermittent test bug #1552589.

It was possible to change the configuration before the provisioner task
was started, and thus there was never any change to observe.
Now we always observer the initial config. It means the test itself
is slightly weaker, because sometimes we never observer the *change*,
but at least the test doesn't accidentally fail.
A better fix would be to wait to change the config until you know
that the config has already been seen. However, we can't do that
via the Observer interface, because there is a race that we
could have already started the Task before we get a chance to
set the observer.

(Review request: http://reviews.vapour.ws/r/4054/)
c17aa73
@jameinel
Remove LXD LinkLocal and MachineLocal addresses. 
fixes-bug#1552423
This changes the LXD client code so that calling Addresses no longer returns
local addresses. I tried just setting their Scope appropriately, but it
seems that we'll still treat them as addresses that we will try to use
for things like SSH.
We know that these addresses won't be accessible outside of the local
machine, so there is no reason for a Provider to be returning them.
We should still see them when we look at SetMachineAddresses, but that
is fine, as we handle those addresses correctly.
307d48c
provider/maas: make bridge script idempotent 
If an interface was already bridged the script would create a stuttered
iface name and an additional bridge_ports option which is invalid. For
example:

  iface eth0 inet manual

  iface test-br-eth0 inet manual

  auto test-br-test-br-eth0
  iface test-br-test-br-eth0 inet static
    address 1.2.3.4
    netmask 255.255.255.0
    gateway 4.3.2.1
    bridge_ports eth0
    bridge_ports test-br-eth0

This is fixed by only adding a bridge if the iface does not have an
existing 'bridge_ports' option.

Fixes [LP:#1553915](https://bugs.launchpad.net/juju-core/+bug/1553915)

(cherry picked from commit 605940d)
f0b4d55
@jujubot
Merge pull request #4636 from jameinel/lxd-remove-local-addresses-155… 
…2423

Remove LXD LinkLocal and MachineLocal addresses.

fixes-1551842

This changes the LXD client code so that calling Addresses no longer returns
local addresses. I tried just setting their Scope appropriately, but it
seems that we'll still treat them as addresses that we will try to use
for things like SSH.
We know that these addresses won't be accessible outside of the local
machine, so there is no reason for a Provider to be returning them.
We should still see them when we look at SetMachineAddresses, but that
is fine, as we handle those addresses correctly.

(Review request: http://reviews.vapour.ws/r/4079/)
7aadf3b
@jujubot
Merge pull request #4640 from frobware/master-lp1553915 
provider/maas: make bridge script idempotent

Forward port from 1.25 of http://reviews.vapour.ws/r/4078/

Fixes [LP:#1553915](https://bugs.launchpad.net/juju-core/+bug/1553915)

(cherry picked from commit 605940d)

(Review request: http://reviews.vapour.ws/r/4083/)
7220819
@jujubot
Merge pull request #4626 from cherylj/fix-destroy-controller-help 
Correct help text to suggest 'juju destroy-model'



(Review request: http://reviews.vapour.ws/r/4066/)
2564190
@kat-co
Merge branch master into feature-minver 
`github.com/juju/juju/version` has migrated to `github.com/juju/version` and `github.com/juju/juju/jujuversion`.

Conflicts:
    agent/agent_test.go
    agent/format-1.16.go
    agent/format-1.16_whitebox_test.go
    agent/format-1.18_whitebox_test.go
    api/apiclient_test.go
    api/provisioner/provisioner.go
    api/provisioner/provisioner_test.go
    api/upgrader/unitupgrader_test.go
    api/upgrader/upgrader.go
    api/upgrader/upgrader_test.go
    apiserver/client/client.go
    apiserver/client/perm_test.go
    apiserver/modelmanager/modelmanager.go
    apiserver/modelmanager/modelmanager_test.go
    apiserver/params/environment.go
    apiserver/service/service.go
    apiserver/service/service_test.go
    cmd/envcmd/environmentcommand.go
    cmd/envcmd/environmentcommand_test.go
    cmd/juju/commands/bootstrap.go
    cmd/juju/commands/bootstrap_test.go
    cmd/juju/commands/main_test.go
    cmd/juju/commands/synctools_test.go
    cmd/juju/commands/upgradejuju.go
    cmd/juju/commands/upgradejuju_test.go
    cmd/jujud/agent/machine.go
    cmd/jujud/agent/upgrade.go
    cmd/jujud/agent/upgrade_test.go
    cmd/plugins/juju-metadata/toolsmetadata.go
    cmd/plugins/juju-metadata/toolsmetadata_test.go
    cmd/plugins/juju-metadata/validatetoolsmetadata_test.go
    cmd/supercommand.go
    container/kvm/live_test.go
    dependencies.tsv
    environs/jujutest/livetests.go
    environs/jujutest/tests.go
    environs/open_test.go
    environs/tools/tools_test.go
    juju/api_test.go
    juju/testing/conn.go
    provider/azure/environ_test.go
    provider/local/environ_test.go
    provider/local/environprovider.go
    provider/maas/environ_whitebox_test.go
    provider/maas/maas_test.go
    state/backups/storage.go
    state/environ.go
    state/state.go
    state/state_test.go
    state/toolstorage/tools.go
    upgrades/agentconfig_test.go
    upgrades/steps118_test.go
    upgrades/steps121_test.go
    upgrades/steps122_test.go
    upgrades/steps123_test.go
    upgrades/steps124_test.go
    upgrades/steps125_test.go
    upgrades/toolstorage_test.go
    version/version.go
    version/version_test.go
    worker/provisioner/container_initialisation_test.go
    worker/provisioner/lxc-broker.go
    worker/provisioner/provisioner_task.go
    worker/provisioner/provisioner_test.go
    worker/upgrader/upgrader.go
    worker/upgrader/upgrader_test.go
e63f632
@kat-co
Contributor

kat-co commented Mar 8, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 8, 2016

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

jujubot commented Mar 8, 2016

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6709
@kat-co
Contributor

kat-co commented Mar 8, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 8, 2016

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

jujubot commented Mar 8, 2016

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6710
@kat-co
Contributor

kat-co commented Mar 8, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 8, 2016

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

jujubot commented Mar 8, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6716
@kat-co
Contributor

kat-co commented Mar 8, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 8, 2016

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

jujubot commented Mar 8, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6717
@kat-co
Contributor

kat-co commented Mar 8, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 8, 2016

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

jujubot commented Mar 8, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6718
@kat-co
Contributor

kat-co commented Mar 9, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 9, 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 9, 2016

@jujubot
Merge pull request #4648 from kat-co/feature-minver 
Merge master into nate-minver.



(Review request: http://reviews.vapour.ws/r/4091/)
7e106de

@jujubot jujubot merged commit 7e106de into juju:nate-minver Mar 9, 2016

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