be verbose explicitly if run from cmdline.

Let the command line (or module args) that set outfile explicitly
override a config'd value of 'verbose'.

Ie, if /etc/cloud/cloud.cfg.d/my.cfg had:
 debug:
  verbose: False

but the user ran:
  cloud-init single --frequency=always --name=debug output.txt

Then they probably wanted to have the debug in output.txt even
though verbose was configured to False.

1 files changed, 7 insertions, 5 deletions

diff --git a/cloudinit/config/cc_debug.py b/cloudinit/config/cc_debug.py
index 55fdf2dd..cfd31fa1 100644
--- a/cloudinit/config/cc_debug.py
+++ b/cloudinit/config/cc_debug.py
@@ -33,15 +33,17 @@ def _make_header(text):
 
 def handle(name, cfg, cloud, log, args):
     verbose = util.get_cfg_by_path(cfg, ('debug', 'verbose'), default=True)
-    if not verbose:
-        log.debug(("Skipping module named %s,"
-                   " verbose printing disabled"), name)
-        return
-    out_file = None
     if args:
+        # if args are provided (from cmdline) then explicitly set verbose
         out_file = args[0]
+        verbose = True
     else:
         out_file = util.get_cfg_by_path(cfg, ('debug', 'output'))
+
+    if not verbose:
+        log.debug(("Skipping module named %s,"
+                   " verbose printing disabled"), name)
+        return
     # Clean out some keys that we just don't care about showing...
     dump_cfg = copy.deepcopy(cfg)
     for k in ['log_cfgs']: