cloud-init-dev team mailing list archive

[Chad Smith <chad.smith@xxxxxxxxxxxxx>]

Diff comments:

> diff --git a/cloudinit/stages.py b/cloudinit/stages.py
> index a1c4a51..1eb92cd 100644
> --- a/cloudinit/stages.py
> +++ b/cloudinit/stages.py
> @@ -821,28 +821,34 @@ class Modules(object):
>          skipped = []
>          forced = []
>          overridden = self.cfg.get('unverified_modules', [])
> +        active_mods = []
> +        all_distros = set([distros.CONFIG_MODULE_SUPPORT_ALL_DISTROS])
>          for (mod, name, _freq, _args) in mostly_mods:
> -            worked_distros = set(mod.distros)
> +            worked_distros = set(mod.distros)  # Minimally [] per fixup_modules
>              worked_distros.update(
>                  distros.Distro.expand_osfamily(mod.osfamilies))
>  
> -            # module does not declare 'distros' or lists this distro
> -            if not worked_distros or d_name in worked_distros:
> -                continue
> -
> -            if name in overridden:
> -                forced.append(name)
> -            else:
> -                skipped.append(name)
> +            # Skip only when the following conditions are all met:
> +            #  - distros are defined in the module != SUPPORT_ALL_DISTROS
> +            #  - the current d_name isn't in distros
> +            #  - and the module name isn't overridden via unverified_modules
> +            if worked_distros and worked_distros != all_distros:

Oops, couldn't drop it as it would automatically skip any modules that didn't define 'distros' at all. Adding it back in.

> +                if d_name not in worked_distros:
> +                    if name not in overridden:
> +                        skipped.append(name)
> +                        continue
> +                    forced.append(name)
> +            active_mods.append([mod, name, _freq, _args])
>  
>          if skipped:
> -            LOG.info("Skipping modules %s because they are not verified "
> +            LOG.info("Skipping modules '%s' because they are not verified "
>                       "on distro '%s'.  To run anyway, add them to "
> -                     "'unverified_modules' in config.", skipped, d_name)
> +                     "'unverified_modules' in config.",
> +                     ','.join(skipped), d_name)
>          if forced:
> -            LOG.info("running unverified_modules: %s", forced)
> +            LOG.info("running unverified_modules: '%s'", ', '.join(forced))
>  
> -        return self._run_modules(mostly_mods)
> +        return self._run_modules(active_mods)
>  
>  
>  def read_runtime_config():


-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/330384
Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:config-modules-allow-distros-all into cloud-init:master.