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
This commit is contained in:
James Slagle 2015-09-28 07:35:36 -04:00
parent b43d00e1a7
commit 3a6719826a

View File

@ -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='<HEAT ENVIRONMENT FILE>',
action='append', dest='environment_files',