openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Return Undercloud role instead of Controller"

This commit is contained in:
Zuul 2022-08-08 02:16:35 +00:00 committed by Gerrit Code Review
parent 6e385b32c0 ca80181f8b
commit 2a08ceccd2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
View File

@ -161,7 +161,7 @@ class TestDeployUndercloud(TestPluginV1):
self.assertEqual(
self.cmd._get_primary_role_name(parsed_args.roles_file,
parsed_args.templates),
'Controller')
'Undercloud')
@mock.patch('tripleoclient.utils.fetch_roles_file')
def test_get_primary_role_name_no_primary(self, mock_data):

3
tripleoclient/v1/tripleo_deploy.py
View File

@ -180,8 +180,7 @@ class Deploy(command.Command):
roles_data = utils.fetch_roles_file(
roles_file_path, templates)
if not roles_data:
# TODO(aschultz): should this be Undercloud instead?
return 'Controller'
return 'Undercloud'
for r in roles_data:
if 'tags' in r and 'primary' in r['tags']: