change back to looking for ssh-import-id in answers
This commit is contained in:
parent
a64ae8bd82
commit
c53b3dae8f
|
@ -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:
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue