Reinstate default-image-id and default-instance-type outside EC2

Reinstate default-image-id and default-instance-type outside EC2

MachineProvider.get_legacy_config_keys should return any *set* config keys
that are only valid in legacy deployments (ie those bootstrapped *before*
upgrading to new config format); bootstrap, deploy, and add-unit are
responsible for checking this and taking action (which might be to warn and
continue (in a legacy environment) or to bomb out (in a new environment)).

The EC2 provider itself also now handles those keys again, if they're there,
and considers them to take precedence over constraints.

https://code.launchpad.net/~fwereade/juju/handle-default-foo-options-outside-ec2/+merge/99026

Requires: https://code.launchpad.net/~fwereade/juju/rework-arch-constraint/+merge/99003

(do not edit description out of merge proposal)

[fwereade, 2012-03-23 14:03:03]

Please take a look.

[hazmat, 2012-03-25 18:16:33]

Thanks for taking care of this william. It looks pretty good.

https://codereview.appspot.com/5874064/diff/1/juju/control/add_unit.py
File juju/control/add_unit.py (right):

https://codereview.appspot.com/5874064/diff/1/juju/control/add_unit.py#newcode49
juju/control/add_unit.py:49: # Ensure all usage of questionable config keys is
questioned and if
this could be refactored into a legacy.check_environment(client) method and used
from add_unit and deploy.

https://codereview.appspot.com/5874064/diff/1/juju/providers/ec2/__init__.py
File juju/providers/ec2/__init__.py (right):

https://codereview.appspot.com/5874064/diff/1/juju/providers/ec2/__init__.py#...
juju/providers/ec2/__init__.py:53: legacy |= amazon_legacy & set(self.config)
i think this would be clearer with the method names ie.
legacy.update(amazon_legacy.intersect(self.config))

[fwereade, 2012-03-26 09:42:21]

https://codereview.appspot.com/5874064/diff/1/juju/control/add_unit.py
File juju/control/add_unit.py (right):

https://codereview.appspot.com/5874064/diff/1/juju/control/add_unit.py#newcode49
juju/control/add_unit.py:49: # Ensure all usage of questionable config keys is
questioned and if
On 2012/03/25 18:16:33, hazmat wrote:
> this could be refactored into a legacy.check_environment(client) method and
used
> from add_unit and deploy.

Became legacy.check(client, legacy_keys); IMO least icky of several icky
options.

https://codereview.appspot.com/5874064/diff/1/juju/providers/ec2/__init__.py
File juju/providers/ec2/__init__.py (right):

https://codereview.appspot.com/5874064/diff/1/juju/providers/ec2/__init__.py#...
juju/providers/ec2/__init__.py:53: legacy |= amazon_legacy & set(self.config)
On 2012/03/25 18:16:33, hazmat wrote:
> i think this would be clearer with the method names ie.
> legacy.update(amazon_legacy.intersect(self.config))

Done.

[fwereade, 2012-03-26 09:44:17]

*** Submitted:

Reinstate default-image-id and default-instance-type outside EC2

MachineProvider.get_legacy_config_keys should return any *set* config keys
that are only valid in legacy deployments (ie those bootstrapped *before*
upgrading to new config format); bootstrap, deploy, and add-unit are
responsible for checking this and taking action (which might be to warn and
continue (in a legacy environment) or to bomb out (in a new environment)).

The EC2 provider itself also now handles those keys again, if they're there,
and considers them to take precedence over constraints.

R=hazmat
CC=
https://codereview.appspot.com/5874064

[hazmat, 2012-03-26 11:51:43]

On Mon, Mar 26, 2012 at 5:42 AM, <fwereade@gmail.com> wrote:

>
>
https://codereview.appspot.**com/5874064/diff/1/juju/**control/add_unit.py<ht...
> File juju/control/add_unit.py (right):
>
> https://codereview.appspot.**com/5874064/diff/1/juju/**
>
control/add_unit.py#newcode49<https://codereview.appspot.com/5874064/diff/1/juju/control/add_unit.py#newcode49>
> juju/control/add_unit.py:49: # Ensure all usage of questionable config
> keys is questioned and if
> On 2012/03/25 18:16:33, hazmat wrote:
>
>> this could be refactored into a legacy.check_environment(**client)
>>
> method and used
>
>> from add_unit and deploy.
>>
>
> Became legacy.check(client, legacy_keys); IMO least icky of several icky
> options.



That seems to assume that there is only one from of legacy.

-k