openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Stop using heat-admin as ansible_ssh_user" into stable/wallaby

This commit is contained in:
Zuul 2022-07-21 14:36:23 +00:00 committed by Gerrit Code Review
parent 0d0a1a4bb1 0e428d964f
commit b118e84a3a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -1529,7 +1529,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
],
'baremetal_deployed_path': env_path,
'ssh_public_keys': 'sekrit',
'ssh_user_name': 'heat-admin',
'ssh_user_name': 'tripleo-admin',
'ssh_private_key_file': self.tmp_dir.join('id_rsa.pub'),
'manage_network_ports': True,
'configure_networking': False,

2
tripleoclient/tests/v2/overcloud_node/test_overcloud_node.py
View File

@ -357,7 +357,7 @@ class TestProvisionNode(fakes.TestOvercloudNode):
],
'baremetal_deployed_path': mock.ANY,
'ssh_public_keys': 'I am a key',
'ssh_user_name': 'heat-admin',
'ssh_user_name': 'tripleo-admin',
'ssh_private_key_file': key_file_name,
'node_timeout': 3600,
'concurrency': 20,

2
tripleoclient/v1/overcloud_admin.py
View File

@ -44,7 +44,7 @@ class Authorize(command.Command):
parser.add_argument(
'--overcloud-ssh-user',
default='heat-admin',
default='tripleo-admin',
help=_('User for ssh access to overcloud nodes')
)
parser.add_argument(

2
tripleoclient/v1/overcloud_deploy.py
View File

@ -690,7 +690,7 @@ class DeployOvercloud(command.Command):
)
parser.add_argument(
'--overcloud-ssh-user',
default='heat-admin',
default='tripleo-admin',
help=_('User for ssh access to overcloud nodes')
)
parser.add_argument(

2
tripleoclient/v2/overcloud_node.py
View File

@ -244,7 +244,7 @@ class ProvisionNode(command.Command):
default=utils.env('OVERCLOUD_STACK_NAME',
default='overcloud'))
parser.add_argument('--overcloud-ssh-user',
default='heat-admin',
default='tripleo-admin',
help=_('User for SSH access to newly deployed '
'nodes'))
parser.add_argument('--overcloud-ssh-key',