airship
/
drydock
Code Issues Proposed changes

[Fix] Error adding SSH keys to MAAS 

- Fix a duplicate variable name causing an exception
  when adding keys to MAAS

Change-Id: Ieeafacc5b5a16a7d8776bf3b6ab4e132170f50b8
This commit is contained in:
Scott Hussey 2018-04-10 12:59:07 -05:00
parent be667ab3c0
commit efa5d4c20b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drydock_provisioner/drivers/node/maasdriver/actions/node.py
View File

@ -639,8 +639,8 @@ class ConfigureUserCredentials(BaseMaasAction):
return
try:
key_list = maas_keys.SshKeys(self.maas_client)
key_list.refresh()
current_keys = maas_keys.SshKeys(self.maas_client)
current_keys.refresh()
except Exception as ex:
self.logger.debug("Error accessing the MaaS API.", exc_info=ex)
self.task.set_status(hd_fields.TaskStatus.Complete)
@ -660,9 +660,9 @@ class ConfigureUserCredentials(BaseMaasAction):
if key_list:
for k in key_list:
try:
if len(key_list.query({'key': k.replace("\n", "")})) == 0:
if len(current_keys.query({'key': k.replace("\n", "")})) == 0:
new_key = maas_keys.SshKey(self.maas_client, key=k)
new_key = key_list.add(new_key)
new_key = current_keys.add(new_key)
msg = "Added SSH key %s to MaaS user profile. Will be installed on all deployed nodes." % (
k[:16])
self.logger.debug(msg)