From 3a6719826ae46de43dfd5fb9d88f884525323939 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 28 Sep 2015 07:35:36 -0400 Subject: [PATCH] Make ssh user configurable The ssh user used to configure keystone on the overcloud shouldn't be hardcoded. Make the user read from a cli arg instead, defaulting to the expected value of heat-admin. Change-Id: I99865e8225ff3b9ab56710756e14783dfd1ea0f0 --- tripleoclient/v1/overcloud_deploy.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 7245f6bea..7acc5b020 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -486,7 +486,7 @@ class DeployOvercloud(command.Command): 'admin@example.com', passwords['OVERCLOUD_ADMIN_PASSWORD'], public=overcloud_ip, - user='heat-admin') + user=parsed_args.overcloud_ssh_user) # NOTE(bcrochet): Bad hack. Remove the ssl_port info from the # os_cloud_config.SERVICES dictionary @@ -879,6 +879,11 @@ class DeployOvercloud(command.Command): help=_('A comma separated list of hosts that should not be ' 'proxied.') ) + parser.add_argument( + '--overcloud-ssh-user', + default='heat-admin', + help=_('User for ssh access to overcloud nodes') + ) parser.add_argument( '-e', '--environment-file', metavar='', action='append', dest='environment_files',