Merge lp:~harlowja/cloud-init/cloud-init-really-skip-baddies into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:1259
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~harlowja/cloud-init/cloud-init-really-skip-baddies/+merge/300802/+edit-commit-message

https://server-team-jenkins.canonical.com/job/cloud-init-ci/37/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/lp-vote-on-merge/11/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/cloud-init-ci/37/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

Unmerged revisions

1259. By Joshua Harlow on 2016-07-21

Actually remove skipped modules

Instead of just logging about distro modules not known
to work on the host distro and then going ahead and still
running them this changes it so they are actually fixed.

=== modified file 'cloudinit/stages.py'
--- cloudinit/stages.py	2016-06-10 21:22:17 +0000
+++ cloudinit/stages.py	2016-07-21 18:17:26 +0000
@@ -808,7 +808,7 @@
     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 @@
                 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 @@
             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():