cloud-init-dev team mailing list archive

[Joshua Harlow <harlowja@xxxxxxxxx>]

Joshua Harlow has proposed merging ~harlowja/cloud-init:skip-things into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/+git/cloud-init/+merge/301110
-- 
Your team cloud init development team is requested to review the proposed merge of ~harlowja/cloud-init:skip-things into cloud-init:master.

diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 47deac6..72c0b94 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -808,7 +808,7 @@ class Modules(object):
     def run_section(self, section_name):
         raw_mods = self._read_modules(section_name)
         mostly_mods = self._fixup_modules(raw_mods)
-        d_name = self.init.distro.name
+        distro_name = self.init.distro.name
 
         skipped = []
         forced = []
@@ -819,7 +819,7 @@ class Modules(object):
                 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:
+            if not worked_distros or distro_name in worked_distros:
                 continue
 
             if name in overridden:
@@ -827,14 +827,20 @@ class Modules(object):
             else:
                 skipped.append(name)
 
+        cleaned_mostly_mods = []
+        for (mod, name, freq, args) in mostly_mods:
+            if name in skipped:
+                continue
+            cleaned_mostly_mods.append((mod, name, freq, args))
+
         if skipped:
             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.", skipped, distro_name)
         if forced:
-            LOG.info("running unverified_modules: %s", forced)
+            LOG.info("Running unverified modules: %s", forced)
 
-        return self._run_modules(mostly_mods)
+        return self._run_modules(cleaned_mostly_mods)
 
 
 def fetch_base_config():