curtin-dev team mailing list archive

[Lucas Albuquerque Medeiros de Moura <lucas.moura@xxxxxxxxxxxxx>]

Diff comments:

> diff --git a/curtin/commands/apply_net.py b/curtin/commands/apply_net.py
> index ddc5056..8e5596b 100644
> --- a/curtin/commands/apply_net.py
> +++ b/curtin/commands/apply_net.py
> @@ -82,22 +82,23 @@ def apply_net(target, network_state=None, network_config=None):
>      elif network_config:
>          netcfg = config.load_config(network_config)
>  
> -        # curtin will pass-through the netconfig into the target
> -        # for rendering at runtime unless the target OS does not
> -        # support NETWORK_CONFIG_V2 feature.
> -        LOG.info('Checking cloud-init in target [%s] for network '
> -                 'configuration passthrough support.', target)
> -        try:
> -            passthrough = net.netconfig_passthrough_available(target)
> -        except util.ProcessExecutionError:
> -            LOG.warning('Failed to determine if passthrough is available')
> -
> -        if passthrough:
> -            LOG.info('Passing network configuration through to target: %s',
> -                     target)
> -            net.render_netconfig_passthrough(target, netconfig=netcfg)
> -        else:
> -            ns = net.parse_net_config_data(netcfg.get('network', {}))
> +        if netcfg:

Yes, you are right. I missed that the env variable will be None and this part of the code will never be called. I will undo this change

> +            # curtin will pass-through the netconfig into the target
> +            # for rendering at runtime unless the target OS does not
> +            # support NETWORK_CONFIG_V2 feature.
> +            LOG.info('Checking cloud-init in target [%s] for network '
> +                     'configuration passthrough support.', target)
> +            try:
> +                passthrough = net.netconfig_passthrough_available(target)
> +            except util.ProcessExecutionError:
> +                LOG.warning('Failed to determine if passthrough is available')
> +
> +            if passthrough:
> +                LOG.info('Passing network configuration through to target: %s',
> +                         target)
> +                net.render_netconfig_passthrough(target, netconfig=netcfg)
> +            else:
> +                ns = net.parse_net_config_data(netcfg.get('network', {}))
>  
>      if not passthrough:
>          LOG.info('Rendering network configuration in target')


-- 
https://code.launchpad.net/~lamoura/curtin/+git/curtin/+merge/383785
Your team curtin developers is subscribed to branch curtin:master.