From 5075a76366db0923f12fd515144078658fdd9a77 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Tue, 3 Sep 2019 14:43:24 +0200 Subject: [PATCH] Use undercloud-connection to local for running validations with the CLI This patch adds the **undercloud_connection** (set to 'ssh' by default) parameter to the get_tripleo_ansible_inventory() function which allow the CLI to create a static inventory file with local connection for the undercloud. Change-Id: I50d486afe2a11e830c72145154dc2b0764aece07 Signed-off-by: Gael Chamoulaud --- tripleoclient/utils.py | 3 ++- tripleoclient/v1/tripleo_validator.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py index fc64bc1c0..5f07883ac 100644 --- a/tripleoclient/utils.py +++ b/tripleoclient/utils.py @@ -1058,6 +1058,7 @@ def load_environment_directories(directories): def get_tripleo_ansible_inventory(inventory_file=None, ssh_user='tripleo-admin', stack='overcloud', + undercloud_connection='ssh', return_inventory_file_path=False): if not inventory_file: inventory_file = '%s/%s' % (os.path.expanduser('~'), @@ -1067,7 +1068,7 @@ def get_tripleo_ansible_inventory(inventory_file=None, '/usr/bin/tripleo-ansible-inventory', '--stack', stack, '--ansible_ssh_user', ssh_user, - '--undercloud-connection', 'ssh', + '--undercloud-connection', undercloud_connection, '--undercloud-key-file', '/var/lib/mistral/.ssh/tripleo-admin-rsa', '--static-yaml-inventory', inventory_file) diff --git a/tripleoclient/v1/tripleo_validator.py b/tripleoclient/v1/tripleo_validator.py index c489a3dc0..5ae348828 100644 --- a/tripleoclient/v1/tripleo_validator.py +++ b/tripleoclient/v1/tripleo_validator.py @@ -367,7 +367,9 @@ class TripleOValidatorRun(command.Command): "/usr/bin/python{}".format(sys.version_info[0]) static_inventory = oooutils.get_tripleo_ansible_inventory( - ssh_user='heat-admin', stack=parsed_args.plan, + ssh_user='heat-admin', + stack=parsed_args.plan, + undercloud_connection='local', return_inventory_file_path=True) failed_val = False