Merge "Make python interpreter option for ansible validation run" into stable/train

This commit is contained in:
Zuul 2020-09-09 17:01:12 +00:00 committed by Gerrit Code Review
commit 72161e0a60
1 changed files with 10 additions and 0 deletions

View File

@ -16,6 +16,7 @@
import argparse import argparse
import json import json
import logging import logging
import sys
import yaml import yaml
from osc_lib import exceptions from osc_lib import exceptions
@ -238,6 +239,7 @@ class TripleOValidatorRun(command.Command):
" run invocation. For example: --limit \"compute-0," " run invocation. For example: --limit \"compute-0,"
" compute-1, compute-5\".") " compute-1, compute-5\".")
) )
parser.add_argument('--playbook', parser.add_argument('--playbook',
nargs="*", nargs="*",
default=None, default=None,
@ -246,6 +248,13 @@ class TripleOValidatorRun(command.Command):
"or a list of playbook.") "or a list of playbook.")
) )
parser.add_argument(
'--python-interpreter',
action='store',
default="/usr/bin/python{}".format(sys.version_info[0]),
help=_("Python interpreter for Ansible execution. ")
)
extra_vars_group = parser.add_mutually_exclusive_group(required=False) extra_vars_group = parser.add_mutually_exclusive_group(required=False)
extra_vars_group.add_argument( extra_vars_group.add_argument(
@ -358,6 +367,7 @@ class TripleOValidatorRun(command.Command):
validations_dir=constants.ANSIBLE_VALIDATION_DIR, validations_dir=constants.ANSIBLE_VALIDATION_DIR,
validation_name=parsed_args.validation_name, validation_name=parsed_args.validation_name,
extra_env_vars=parsed_args.extra_env_vars, extra_env_vars=parsed_args.extra_env_vars,
python_interpreter=parsed_args.python_interpreter,
quiet=parsed_args.quiet) quiet=parsed_args.quiet)
# Build output # Build output