lp:~cmars/juju-core/charm-owner-scope

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~go-bot/juju-core/trunk

Juju Engineering: Pending requested 2014-01-30

Diff: 154 lines (+53/-13)

2 files modified

charm/url.go (+32/-3)
charm/url_test.go (+21/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2284. By Casey Marshall on 2014-02-01

Merged from tip, up to 1.17.3.

2283. By Casey Marshall on 2014-01-30

Add user@origin to charm URL. Defaults to implicit "launchpad" origin
if not specified for backwards compatibility.

2282. By Dimiter Naydenov on 2014-01-30

[r=dimitern],[bug=1257649] bootstrap: Added configurable timeout and delays

Fixed bug #1257649: ssh timeout for bootstrap
could be configurable, by adding 3 new config
settings:
- bootstrap-timeout (default: 600s = 10m)
- bootstrap-retry-delay (default: 5s)
- bootstrap-addresses-delay (default: 10s)

All of them are integers, measured in seconds,
and also all of them are optional and have the
specified defaults.

Updated the bootstrap command's help text to
include the new config settings.

https://codereview.appspot.com/58170045/

R=natefinch

2281. By Dimiter Naydenov on 2014-01-30

[r=dimitern],[bug=1067979] state;apiserver: Fix a race - lp bug #1067979

This introduces some changes to how charm store
charms are added through the API (in state and
to provider storage). Now PrepareStoreCharmUpload
is called before trying to download the charm,
repackage it and upload it to storage, in order
to reserve a charm URL in state with pending
state. Added a test that demonstrates multiple
concurrent deployments of the same charm does
not cause the race issues, like mentioned in
the bug.

A few drive-by fixes brought up during review:
* Added ReadSHA256 and ReadFileSHA256 helpers in
  utils, and changed most places where hashes
  are calculated to use them.
* Charms are now uploaded to storage with a
  randomly generated archive names with the
  format "<charm-name>-<revision>-<uuid>".
  This allows multiple concurrent uploads
  to happen safely, and at the end AddCharm
  in the API checks to see if the charm info
  is already updated in state and if so, deletes
  the duplicated upload.
* Added GetEnvironStorage helper to environs/testing.
* Fixed potential compatibility issues with older
  versions and the recently added PendingUpload
  and Placeholder fields of the charm document.

Also tested multiple concurrent deployments with
the local provider manually and updated the bug
accordingly.

https://codereview.appspot.com/53210044/

R=fwereade

2280. By Abel Deuring on 2014-01-30

[r=adeuring],[bug=1250285] juju switch -l: Show all defined environments when JUJU_ENV is set.

2279. By Andrew Wilkins on 2014-01-30

[r=axwalk],[bug=1274018] manual: mark specified host as a public address

Recent work to have machine agents publish their machine addresses has caused
a problem for the manual provider. The bootstrap node currently does not
record the host/IP bootstrapped with as being public, and so any machine
address that comes along may override it as being the "most public address".

I have changed manual provisioning/bootstrap to mark the address we
specified explicitly as being public.

Fixes #1274018

https://codereview.appspot.com/56310044/

2278. By Ian Booth on 2014-01-30

[r=wallyworld] Fix various bootstrap issues

This fixed bootstrap on MAAS with --upload-tools
and also general bootstrap with --metadata-source.
It also changes dummy storage so that it mimics
MAAS behaviour to hopefully help catch future issues.

https://codereview.appspot.com/58510044/

2277. By Andrew Wilkins on 2014-01-30

[r=axwalk] Add option to disable apt in ProvisioningScript

The ProvisioningScript API is updated to take a
boolean option DisablePackageCommands to completely
disable all package-related commands (apt-get, etc.)
This is for the benefit of external provisioners
that require more control over which packages are
installed and from where.

https://codereview.appspot.com/58490043/

2276. By Andrew Wilkins on 2014-01-30

[r=axwalk] utils/ssh: use go.crypto/ssh.ParseAuthorizedKey

There's a function in go.crypto/ssh that we
can use for parsing authorized_key lines. We
should use it.

https://codereview.appspot.com/58540043/

2275. By Tim Penhey on 2014-01-30

[r=thumper] Don't try to remove the restart link if we aren't using restart links to restart.