openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Make ssh user configurable"

Browse Source
This commit is contained in:
Jenkins 2015-10-05 08:29:52 +00:00 committed by Gerrit Code Review
commit 1da7b10e55
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tripleoclient/v1/overcloud_deploy.py
View File

@ -486,7 +486,7 @@ class DeployOvercloud(command.Command):
'admin@example.com', 'admin@example.com',
passwords['OVERCLOUD_ADMIN_PASSWORD'], passwords['OVERCLOUD_ADMIN_PASSWORD'],
public=overcloud_ip, public=overcloud_ip,
user='heat-admin') user=parsed_args.overcloud_ssh_user)
# NOTE(bcrochet): Bad hack. Remove the ssl_port info from the # NOTE(bcrochet): Bad hack. Remove the ssl_port info from the
# os_cloud_config.SERVICES dictionary # os_cloud_config.SERVICES dictionary
@ -879,6 +879,11 @@ class DeployOvercloud(command.Command):
help=_('A comma separated list of hosts that should not be ' help=_('A comma separated list of hosts that should not be '
'proxied.') 'proxied.')
) )
parser.add_argument(
'--overcloud-ssh-user',
default='heat-admin',
help=_('User for ssh access to overcloud nodes')
)
parser.add_argument( parser.add_argument(
'-e', '--environment-file', metavar='<HEAT ENVIRONMENT FILE>', '-e', '--environment-file', metavar='<HEAT ENVIRONMENT FILE>',
action='append', dest='environment_files', action='append', dest='environment_files',