From 276ed3ac3bda9942dc43a1b598c00ff6ef119594 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Thu, 3 Oct 2019 13:14:56 -0400 Subject: [PATCH] Don't set transport=local in ansible.cfg The "openstack tripleo config generate ansible" command should no longer generate an ansible.cfg that has transport=local set. The ansible.cfg is usable outside of undercloud/standalone mode. Also updates the command help to not be specific to undercloud/standalone. Note that tripleo_deploy.py already takes care of setting ansible_connection=local anyway for standalone mode. Change-Id: I535f9c5be24cc1876d991aac30fea5139f4fcd2b --- tripleoclient/v1/tripleo_config.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tripleoclient/v1/tripleo_config.py b/tripleoclient/v1/tripleo_config.py index 94691ba9a..3cddbd322 100644 --- a/tripleoclient/v1/tripleo_config.py +++ b/tripleoclient/v1/tripleo_config.py @@ -28,7 +28,7 @@ from tripleo_common.actions import ansible class GenerateAnsibleConfig(command.Command): - """Generate the default ansible.cfg for UC/AIO-standalone deployments.""" + """Generate the default ansible.cfg for deployments.""" log = logging.getLogger(__name__ + ".GenerateAnsibleConfig") @@ -64,8 +64,6 @@ class GenerateAnsibleConfig(command.Command): 'match the user name executing this command!') % parsed_args.deployment_user) - # FIXME(bogdando): unhardcode key/transport for future multi-node ansible.write_default_ansible_cfg(parsed_args.output_dir, parsed_args.deployment_user, - ssh_private_key=None, - transport='local') + ssh_private_key=None)