On Mon, 22 May 2017, Ryan Harper wrote: > Generally looks fine, one question w.r.t confirming explict_dslist check > > Diff comments: > > > diff --git a/cloudinit/sources/DataSourceEc2.py > > b/cloudinit/sources/DataSourceEc2.py > > index 2f9c7ed..818a639 100644 > > --- a/cloudinit/sources/DataSourceEc2.py > > +++ b/cloudinit/sources/DataSourceEc2.py > > @@ -266,6 +267,12 @@ def parse_strict_mode(cfgval): > > return mode, sleep > > > > > > +def _is_explicit_dslist(dslist): > > + if 'Ec2' not in dslist: > > + return False > > + return (len(dslist) == 1 or (len(dslist) == 2 and 'None' in dslist)) > > if we know dslist is len == 2, then We could ensure it looks like: > ['Ec2', None] > > Right? That's exactly what we're looking for? Verus this [None, 'Ec2'] > which would pass this test but not be what we're looking for IIUC
Yeah, I avoided checking for 'Ec2' because if this datasoruce is running, then Ec2 is in the list. But I think it makes more sense to be explicit Will cahnge as you sigguested. if dslist == ['Ec2', 'None'] or dslist == ['Ec2'] sm -- https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/324274 Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/1683038-ec2-no-warn-on-explicit into cloud-init:master. _______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
