← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~chad.smith/cloud-init:feature/azure-disable-imds-networking into cloud-init:master

 


Diff comments:

> diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
> index 39391d0..2a6d5b1 100644
> --- a/cloudinit/sources/DataSourceAzure.py
> +++ b/cloudinit/sources/DataSourceAzure.py
> @@ -619,7 +622,14 @@ class DataSourceAzure(sources.DataSource):
>                the blacklisted devices.
>          """
>          if not self._network_config:
> -            self._network_config = parse_network_config(self._metadata_imds)
> +            if self.ds_cfg.get('apply_network_config'):
> +                nc_src = self._metadata_imds
> +            else:

the comment you have here is confusing.  "or when disabled" implies that
"Xenial and earlier" are not disabled.

I think enough comment is:
   Ubuntu 16.04 packages carry patches to take this path for backward compat.

given the RELEASE_BLOCKER comment above, I dont even really think you need this at all.

> +                # Xenial and earlier, or when disabled use fallback network
> +                # config instead of IMDS because the image contains the
> +                # necessary ifup/down hotplug hooks
> +                nc_src = None
> +            self._network_config = parse_network_config(nc_src)
>          return self._network_config
>  
>  


-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356989
Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:feature/azure-disable-imds-networking into cloud-init:master.