cloud-init-dev team mailing list archive

[Pavel Zakharov <pavel.zakha@xxxxxxxxx>]

Thanks for the reviews.

Yes I understand that if the user really wants to access the system, they will find a way to do so. The intent of this is to make it non-trivial. Your reasoning is spot on.

Diff comments:

> diff --git a/cloudinit/stages.py b/cloudinit/stages.py
> index da7d349..94b3f0f 100644
> --- a/cloudinit/stages.py
> +++ b/cloudinit/stages.py
> @@ -548,7 +548,17 @@ class Init(object):
>          with events.ReportEventStack("consume-user-data",
>                                       "reading and applying user-data",
>                                       parent=self.reporter):
> -            self._consume_userdata(frequency)
> +            cfg = self.cfg

Yes, good point, this definitely looks cleaner.

> +            if 'allow_userdata' in cfg:
> +                allow_userdata = cfg['allow_userdata']
> +            else:
> +                allow_userdata = True
> +
> +            if allow_userdata:
> +                LOG.debug('allow_userdata = True: consuming user-data')
> +                self._consume_userdata(frequency)
> +            else:
> +                LOG.debug('allow_userdata = False: discarding user-data')
>          with events.ReportEventStack("consume-vendor-data",
>                                       "reading and applying vendor-data",
>                                       parent=self.reporter):


-- 
https://code.launchpad.net/~pzakha/cloud-init/+git/cloud-init/+merge/367721
Your team cloud-init commiters is requested to review the proposed merge of ~pzakha/cloud-init:userdata into cloud-init:master.