Merge "Run validation without authentication in particular context" into stable/train

This commit is contained in:
Zuul 2021-02-10 02:52:05 +00:00 committed by Gerrit Code Review
commit 475a082498
1 changed files with 20 additions and 9 deletions

View File

@ -19,6 +19,7 @@ import logging
import sys import sys
import yaml import yaml
from openstack import exceptions as os_exceptions
from osc_lib import exceptions from osc_lib import exceptions
from osc_lib.i18n import _ from osc_lib.i18n import _
from prettytable import PrettyTable from prettytable import PrettyTable
@ -327,15 +328,25 @@ class TripleOValidatorRun(command.Command):
def _run_validator_run(self, parsed_args): def _run_validator_run(self, parsed_args):
LOG = logging.getLogger(__name__ + ".ValidationsRunAnsible") LOG = logging.getLogger(__name__ + ".ValidationsRunAnsible")
# Try to perform OpenStack authentication, if no authentication
clients = self.app.client_manager # and static inventory provided continue, else raise error.
plans = plan_management.list_deployment_plans(clients) try:
clients = self.app.client_manager
if parsed_args.plan and parsed_args.plan not in plans: clients._auth_required = True
raise exceptions.CommandError( clients.setup_auth()
"The plan '{}' doesn't exist. " except os_exceptions.ConfigException:
"Please use one of those {}".format(parsed_args, plans)) LOG.warning("Running Validations without authentication.")
if not parsed_args.static_inventory:
raise exceptions.CommandError(
"No static inventory provided, please provide a valid"
"inventory or use authentication.")
else:
plans = plan_management.list_deployment_plans(clients)
if parsed_args.plan and parsed_args.plan not in plans:
raise exceptions.CommandError(
"The plan '{}' doesn't exist. "
"Please use one of those {}".format(parsed_args,
plans))
limit = parsed_args.limit limit = parsed_args.limit
extra_vars = parsed_args.extra_vars extra_vars = parsed_args.extra_vars
if parsed_args.extra_vars_file: if parsed_args.extra_vars_file: