lp://staging/~axwalk/juju-core/lp1239550-check-jenv-consistency

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/~go-bot/juju-core/trunk

Juju Engineering: Pending requested 2013-10-18

Diff: 97 lines (+36/-4)

1 file modified

environs/open.go (+36/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1239550: juju should warn if .jenv doesn't match environments.yaml

High

Won't Fix

Link a bug report

Related blueprints

1995. By Andrew Wilkins on 2013-10-18

environs: warn if .jenv/env.yaml are inconsistent

Changes in environments.yaml do not take effect
for an environment that has already been prepared.
In some cases, it might not be obvious to a user
that the environment is prepared, and that changes
will not take effect. e.g.:
 - User called sync-tools, then modified env.yaml,
   then bootstrapped.
 - User bootstrapped, bootstrap failed, then modified
   env.yaml and tried again. We could remove the
   .jenv file on failure, but we can't guarantee
   juju won't die before doing so.
 - User is bootstrapping the null provider; since
   destroy-environment is not implemented, the user
   must remove the .jenv file manually. It's easy to
   forget to do that.

We now log a warning if any values have been
changed in environments.yaml after preparing,
and provide some direction on what to do.

Also: don't call Prepare for config retrieved from
the config store (i.e. already prepared config).

Fixes #1239550

1994. By Ian Booth on 2013-10-17

[r=wallyworld],[bug=1237286] Merge new image metadata with existing

When image id metadata is generated, any existing metadata is
now loaded and then the new metadata is merged in. This allows
the generate-image plugin to be run multiple times to build up
metadata for multiple images. Some fairly extensive refactoring
to how image metadata search constraints are set up was required.

https://codereview.appspot.com/14663043/

1993. By Ian Booth on 2013-10-17

[r=wallyworld],[bug=1237286] Write image metadata using json serialisation

This branch writes outs simplestreams image metadata using
json serialisation instead of a template based approach. It
is a pre-requisit to allow the next step of merging new image
metadata instead of overwriting. This will be used when setting
up private clouds.

https://codereview.appspot.com/14540055/

1992. By Tim Penhey on 2013-10-16

[r=thumper],[bug=1240709] Fix local provider bootstrap.

The bootstrap storage was not set up for the local
provider.

https://codereview.appspot.com/14573046/

1991. By Roger Peppe on 2013-10-16

[r=rogpeppe] environs/cloudinit: simplify testing

Allow inexact matching of cloudinit output
so that tests can more closely fit what they're actually
trying to test.

https://codereview.appspot.com/14665043/

1990. By Roger Peppe on 2013-10-16

[r=rogpeppe] provider/maas: do not use environ-uuid

As pointed out by fwereade, it could be
confusing to have two things in the system
that both purport to be a uuid for the environ.

Also make the MAAS EnvironProvider.Validate
check that we're not changing the maas-agent-name.

https://codereview.appspot.com/14741045/

1989. By Julian Edwards on 2013-10-16

[r=axwalk],[bug=1081247],[bug=1229275] Use the environment's UUID as a file prefix for all files in MAAS private storage to prevent different environments from overlapping.

1988. By Andrew Wilkins on 2013-10-16

[r=axwalk],[bug=1235717] Fix tools metadata generation for null provider

There's two functional changes here:
 - If there's existing tools metadata, use it
   if it has sha256/size in it, and the tools
   haven't been replaced.
 - Don't use net/http or the tools URL when
   fetching tools to compute sha256/size. That
   doesn't work with sshstorage.
 - Don't fetch existing tools to resolve metadata
   during normal tools syncing operations. Only
   the "juju metadata generate-tools" command
   will do this now.

Additionally, I have refactored
environs/tools/simplestreams.go, to make the
intent of WriteMetadata (now MergeAndWriteMetadata)
more obvious. That function is now composed of
several other more specific functions.

Fixes #1235717

https://codereview.appspot.com/14527043/

1987. By Ian Booth on 2013-10-16

[r=wallyworld],[bug=1237286] Improve the image metadata generation command

juju metadata generate-image was originally written
as a developer tool to aid simplestreams development.
It now is useful for setting up private clouds so has
been given a facelift to make it more user friendly.
The key feature is it will now use the current environment
to pick up most of what it needs, and the user just has to
supply the image id and architecture (if something different
to amd64 is required).

https://codereview.appspot.com/14502059/

1986. By Andrew Wilkins on 2013-10-16

[r=axwalk] testing/checkers: make LogMatches inexact

In the rare case that we want to check log messages,
we want to check a particular message has been logged,
not check the entirety of the log. This allows for
changes (unrelated additions/removals) in logging
without affecting tests.

https://codereview.appspot.com/14430064/