From 3ba18810c1d303db440126f87cbfc2135fb9fecd Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Fri, 30 Oct 2020 16:56:20 +0000
Subject: [PATCH] Add verbosity argument

Allow easy control over Ansible verbosity by allowing -v[vvv]
molecule arguments.
---
 docs/configuration.rst |  1 +
 lib/molecule/config.py |  1 +
 lib/molecule/shell.py  | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index ae790c1807..29dc91aa73 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -31,6 +31,7 @@ MOLECULE_DEPENDENCY_NAME          Dependency type name, usually 'galaxy'
 MOLECULE_DRIVER_NAME              Name of the molecule scenario driver
 MOLECULE_PROVISIONER_NAME         Name of the provisioner tool (usually 'ansible')
 MOLECULE_SCENARIO_NAME            Name of the scenario
+MOLECULE_VERBOSITY                Determine Ansible verbosity level.
 MOLECULE_VERIFIER_NAME            Name of the verifier tool (usually 'ansible')
 MOLECULE_VERIFIER_TEST_DIRECTORY  ?
 ================================  ===========================================================
diff --git a/lib/molecule/config.py b/lib/molecule/config.py
index 269c340192..de35eefb62 100644
--- a/lib/molecule/config.py
+++ b/lib/molecule/config.py
@@ -35,6 +35,7 @@
 
 LOG = logger.get_logger(__name__)
 MOLECULE_DEBUG = boolean(os.environ.get("MOLECULE_DEBUG", "False"))
+MOLECULE_VERBOSITY = int(os.environ.get("MOLECULE_VERBOSITY", 0))
 MOLECULE_DIRECTORY = "molecule"
 MOLECULE_FILE = "molecule.yml"
 MOLECULE_KEEP_STRING = "MOLECULE_"
diff --git a/lib/molecule/shell.py b/lib/molecule/shell.py
index 1c2bd15b25..134e820f69 100644
--- a/lib/molecule/shell.py
+++ b/lib/molecule/shell.py
@@ -18,7 +18,7 @@
 #  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 #  DEALINGS IN THE SOFTWARE.
 """Molecule Shell Module."""
-
+import os
 import sys
 from functools import lru_cache
 
@@ -31,7 +31,7 @@
 from molecule import command
 from molecule.api import drivers
 from molecule.command.base import click_group_ex
-from molecule.config import MOLECULE_DEBUG, ansible_version
+from molecule.config import MOLECULE_DEBUG, MOLECULE_VERBOSITY, ansible_version
 from molecule.util import lookup_config_file
 
 click_completion.init()
@@ -62,6 +62,13 @@ def _version_string() -> str:
     default=MOLECULE_DEBUG,
     help="Enable or disable debug mode. Default is disabled.",
 )
+@click.option(
+    "-v",
+    "--verbose",
+    count=True,
+    default=MOLECULE_VERBOSITY,
+    help="Increase Ansible verbosity level. Default is 0.",
+)
 @click.option(
     "--base-config",
     "-c",
@@ -85,7 +92,7 @@ def _version_string() -> str:
     prog_name="molecule", version=molecule.__version__, message=_version_string()
 )  # type: ignore
 @click.pass_context
-def main(ctx, debug, base_config, env_file):  # pragma: no cover
+def main(ctx, debug, verbose, base_config, env_file):  # pragma: no cover
     """
     Molecule aids in the development and testing of Ansible roles.
 
@@ -96,9 +103,13 @@ def main(ctx, debug, base_config, env_file):  # pragma: no cover
     ctx.obj = {}
     ctx.obj["args"] = {}
     ctx.obj["args"]["debug"] = debug
+    ctx.obj["args"]["verbose"] = verbose
     ctx.obj["args"]["base_config"] = base_config
     ctx.obj["args"]["env_file"] = env_file
 
+    if verbose:
+        os.environ["ANSIBLE_VERBOSITY"] = str(verbose)
+
 
 # runtime environment checks to avoid delayed failures
 if sys.version_info[0] > 2: