← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~daniel-thewatkins/cloud-init/+git/cloud-init:networking into cloud-init:master

 


Diff comments:

> diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
> index ea707c0..f308d03 100644
> --- a/cloudinit/net/__init__.py
> +++ b/cloudinit/net/__init__.py
> @@ -756,7 +756,11 @@ class EphemeralIPv4Network(object):
>                      ' to %s', self.connectivity_url)
>                  return
>  
> -        self._bringup_device()
> +        device_brought_up = self._bringup_device()
> +        if not device_brought_up:

Probably don't need the local var defined as you explain it in the comment:

if not self._bringup_device():
   # If we didn't bring the device up, no need to do anything else
   # with it
   return

> +            # If we didn't bring the device up, no need to do anything else
> +            # with it
> +            return
>  
>          # rfc3442 requires us to ignore the router config *if* classless static
>          # routes are provided.


-- 
https://code.launchpad.net/~daniel-thewatkins/cloud-init/+git/cloud-init/+merge/372289
Your team cloud-init commiters is requested to review the proposed merge of ~daniel-thewatkins/cloud-init/+git/cloud-init:networking into cloud-init:master.


References