starlingx/distcloud
Code Issues Proposed changes

Merge "Remove smapi password for rehoming"

Browse Source
This commit is contained in:
Zuul
2022-10-17 15:31:10 +00:00
committed by Gerrit Code Review
parent d33c39a6bc e991bb9cf9
commit 21ebcb5954
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
distributedcloud/dcmanager/manager/subcloud_manager.py
View File

@@ -447,12 +447,6 @@ class SubcloudManager(manager.Manager):
payload['users'][user] = \
str(keyring.get_password(
user, dccommon_consts.SERVICES_USER_NAME))
# The password of smapi user is expected to the aligned during rehoming
# a subcloud. Add smapi into the user to replace list.
if migrate_flag:
payload['users']['smapi'] = \
str(keyring.get_password(
'smapi', dccommon_consts.SERVICES_USER_NAME))
# Create the ansible inventory for the new subcloud
utils.create_subcloud_inventory(payload,

1
distributedcloud/dcmanager/tests/unit/manager/test_subcloud_manager.py
View File

@@ -500,7 +500,6 @@ class TestSubcloudManager(base.DCManagerTestCase):
mock_create_addn_hosts.assert_called_once()
mock_create_subcloud_inventory.assert_called_once()
mock_write_subcloud_ansible_config.assert_called_once()
mock_keyring.get_password.assert_called_with('smapi', 'services')
mock_thread_start.assert_called_once()
mock_create_intermediate_ca_cert.assert_called_once()
mock_compose_rehome_command.assert_called_once()