cloud-init-dev team mailing list archive
-
cloud-init-dev team
-
Mailing list archive
-
Message #04199
Re: [Merge] ~chad.smith/cloud-init:fix-instance-identity-upgrade-path into cloud-init:master
typo in comment
Diff comments:
> diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
> index e14553b..21e9ef8 100644
> --- a/cloudinit/sources/DataSourceEc2.py
> +++ b/cloudinit/sources/DataSourceEc2.py
> @@ -147,6 +147,12 @@ class DataSourceEc2(sources.DataSource):
> def get_instance_id(self):
> if self.cloud_platform == Platforms.AWS:
> # Prefer the ID from the instance identity document, but fall back
> + if not getattr(self, 'identity', None):
> + # If re-using cached datasource, it's get_data run didn't
s,it's,its
> + # setup self.identity. So we need to do that now.
> + api_version = self.get_metadata_api_version()
> + self.identity = ec2.get_instance_identity(
> + api_version, self.metadata_address).get('document', {})
> return self.identity.get(
> 'instanceId', self.metadata['instance-id'])
> else:
--
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/337475
Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:fix-instance-identity-upgrade-path into cloud-init:master.
References