cloud-init-dev team mailing list archive

[Scott Moser <ssmoser2+ubuntu@xxxxxxxxx>]

I think i'm fine with this as long as we get a c-i run.
I do have one comment in line. but other than that if you think its good, i think its good.


Diff comments:

> diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
> index 7007d9e..1d01000 100644
> --- a/cloudinit/sources/DataSourceAzure.py
> +++ b/cloudinit/sources/DataSourceAzure.py
> @@ -1025,6 +1078,159 @@ def load_azure_ds_dir(source_dir):
>      return (md, ud, cfg, {'ovf-env.xml': contents})
>  
>  
> +def parse_network_config(imds_metadata):
> +    """Convert imds_metadata dictionary to network v2 configuration.
> +
> +    Parses network configuration from imds metadata if present or generate
> +    fallback network config excluding mlx4_core devices.
> +
> +    @param: imds_metadata: Dict of content read from IMDS network service.
> +    @return: Dictionary containing network version 2 standard configuration.
> +    """
> +    if imds_metadata != sources.UNSET and imds_metadata:
> +        netconfig = {'version': 2, 'ethernets': {}}
> +        LOG.debug('Azure: generating network configuration from IMDS')
> +        network_metadata = imds_metadata['network']
> +        for idx, intf in enumerate(network_metadata['interface']):
> +            nicname = 'eth{idx}'.format(idx=idx)
> +            dev_config = {}
> +            for addr4 in intf['ipv4']['ipAddress']:
> +                privateIpv4 = addr4['privateIpAddress']
> +                if privateIpv4:
> +                    if dev_config.get('dhcp4', False):
> +                        # Append static address config for nic > 1
> +                        netPrefix = intf['ipv4']['subnet'][0].get(
> +                            'prefix', '24')
> +                        if not dev_config.get('addresses'):
> +                            dev_config['addresses'] = []
> +                        dev_config['addresses'].append(
> +                            '{ip}/{prefix}'.format(
> +                                ip=privateIpv4, prefix=netPrefix))
> +                    else:
> +                        dev_config['dhcp4'] = True
> +            for addr6 in intf['ipv6']['ipAddress']:
> +                privateIpv6 = addr6['privateIpAddress']
> +                if privateIpv6:
> +                    dev_config['dhcp6'] = True
> +                    break
> +            if dev_config:
> +                mac = ':'.join(re.findall(r'..', intf['macAddress']))
> +                dev_config.update(
> +                    {'match': {'macaddress': mac.lower()},
> +                     'set-name': nicname})
> +                netconfig['ethernets'][nicname] = dev_config
> +    else:
> +        blacklist = ['mlx4_core']
> +        LOG.debug('Azure: generating fallback configuration')
> +        # generate a network config, blacklist picking mlx4_core devs
> +        netconfig = net.generate_fallback_config(
> +            blacklist_drivers=blacklist, config_driver=True)
> +    return netconfig
> +
> +
> +def get_metadata_from_imds(fallback_nic, retries):
> +    """Query Azure's network metadata service, returning a dictionary.
> +
> +    If network is not up, setup ephemeral dhcp on fallback_nic to talk to the
> +    IMDS. For more info on IMDS:
> +        https://docs.microsoft.com/en-us/azure/virtual-machines/windows/instance-metadata-service
> +
> +    @param fallback_nic: String. The name of the nic which requires active
> +        networ in order to query IMDS.
> +    @param retries: The number of retries of the IMDS_URL.
> +
> +    @return: A dict of instance metadata containing compute and network
> +        info.
> +    """
> +    if net.is_up(fallback_nic):
> +        return util.log_time(
> +            logfunc=LOG.debug,
> +            msg='Crawl of Azure Instance Metadata Service (IMDS)',
> +            func=_get_metadata_from_imds, args=(retries,))
> +    else:
> +        with EphemeralDHCPv4(fallback_nic):
> +            return util.log_time(
> +                logfunc=LOG.debug,
> +                msg='Crawl of Azure Instance Metadata Service (IMDS)',
> +                func=_get_metadata_from_imds, args=(retries,))
> +
> +
> +def _get_metadata_from_imds(retries):
> +
> +    def retry_on_url_error(msg, exception):
> +        if isinstance(exception, UrlError) and exception.code == 404:
> +            return True  # Continue retries
> +        return False  # Stop retries on all other exceptions, including 404s
> +
> +    url = IMDS_URL + "instance?api-version=2017-12-01"
> +    headers = {"Metadata": "true"}
> +    try:
> +        response = readurl(
> +            url, timeout=1, headers=headers, retries=retries,
> +            exception_cb=retry_on_url_error)
> +    except Exception as e:
> +        LOG.debug('Ignoring IMDS instance metadata: %s', e)
> +        return {}
> +    try:
> +        return util.load_json(str(response))
> +    except json.decoder.JSONDecodeError:
> +        LOG.warning(
> +            'Ignoring non-json IMDS instance metadata: %s', str(response))
> +    return {}
> +
> +
> +def maybe_remove_ubuntu_network_config_scripts(paths=None):
> +    """Remove Azure-specific ubuntu network config for non-primary nics.
> +
> +    @param paths: List of networking scripts or directories to remove when
> +        present.
> +
> +    In certain supported ubuntu images, static udev rules or netplan yaml
> +    config is delivered in the base ubuntu image to support dhcp on any
> +    additional interfaces which get attached by a customer at some point
> +    after initial boot. Since the Azure datasource can now regenerate
> +    network configuration as metadata reports these new devices, we no longer
> +    want the udev rules or netplan's 90-azure-hotplug.yaml to configure
> +    networking on eth1 or greater as it might collide with cloud-init's
> +    configuration.
> +
> +    Remove the any existing extended network scripts if the datasource is
> +    enabled to write network per-boot.
> +    """
> +    if not paths:
> +        paths = UBUNTU_EXTENDED_NETWORK_SCRIPTS
> +    logged = False
> +    for path in paths:
> +        if os.path.exists(path):
> +            if not logged:
> +                LOG.info(
> +                    'Removing Ubuntu extended network scripts because'
> +                    ' cloud-init updates Azure network configuration on the'
> +                    ' following event: %s.',
> +                    EventType.BOOT)
> +                logged = True
> +            if os.path.isdir(path):
> +                util.del_dir(path)
> +            else:
> +                util.del_file(path)
> +
> +
> +def _is_platform_viable(seed_dir):
> +    """Check platform environment to report if this datasource may run."""
> +    asset_tag = util.read_dmi_data('chassis-asset-tag')
> +    if asset_tag == AZURE_CHASSIS_ASSET_TAG:
> +        return True
> +    LOG.debug("Non-Azure DMI asset tag '%s' discovered.", asset_tag)
> +    if os.path.exists(os.path.join(seed_dir, 'ovf-env.xml')):
> +        return True
> +    if util.which('systemd-detect-virt'):

since you're notn doing the 'has_fs_with_label' of 'rd_rdfe_*'
you might as well just return False here.
if you get to line 414, returning False is the only path out.

> +        (virt_type, _err) = util.subp(
> +            ['systemd-detect-virt'], rcs=[0, 1], capture=True)
> +        if virt_type.strip() != 'microsoft':
> +            return False
> +    return False
> +
> +
>  class BrokenAzureDataSource(Exception):
>      pass
>  


-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/352660
Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:feature/azure-network-per-boot into cloud-init:master.