change back to looking for ssh-import-id in answers

This commit is contained in:
Michael Hudson-Doyle 2018-06-01 10:22:55 +12:00
parent a64ae8bd82
commit c53b3dae8f
2 changed files with 4 additions and 4 deletions

View File

@ -17,7 +17,7 @@ Identity:
hostname: ubuntu-server
# ubuntu
password: '$6$wdAcoXrU039hKYPd$508Qvbe7ObUnxoj15DRCkzC3qO7edjH0VV7BPNRDYK4QR8ofJaEEF2heacn0QgD.f8pO8SNp83XNdWG6tocBM1'
ssh_import_id: lp:mwhudson
ssh-import-id: lp:mwhudson
SnapList:
snaps:
hello:

View File

@ -46,8 +46,8 @@ class IdentityController(BaseController):
'hostname': self.answers['hostname'],
'password': self.answers['password'],
}
if 'ssh_import_id' in self.answers:
ssh_import_id = self.answers['ssh_import_id']
if 'ssh-import-id' in self.answers:
ssh_import_id = self.answers['ssh-import-id']
self.fetch_ssh_keys(d, ssh_import_id)
else:
self.done(d)
@ -99,7 +99,7 @@ class IdentityController(BaseController):
# Happens if the fetch is cancelled.
return
user_spec, key_material, fingerprints = result
if 'ssh_import_id' in self.answers:
if 'ssh-import-id' in self.answers:
user_spec['ssh_keys'] = key_material.splitlines()
self.loop.set_alarm_in(0.0,
lambda loop, ud: self.done(user_spec))