Skip to content

Commit

Permalink
Merge pull request #1782 from tcmitchell/1726-sync-wireless
Browse files Browse the repository at this point in the history
Use a placeholder ssh key in geni-sync-wireless
  • Loading branch information
tcmitchell authored Jan 27, 2017
2 parents cf6f150 + 51c4462 commit 27f3343
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

## Changes

* Use a placeholder ssh key in geni-sync-wireless
([#1726](https://github.com/GENI-NSF/geni-portal/issues/1726))
* Fix redirect on upload ssh key
([#1778](https://github.com/GENI-NSF/geni-portal/issues/1778))

Expand Down
10 changes: 7 additions & 3 deletions bin/geni-sync-wireless
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,13 @@ class WirelessProjectManager:
if username == self._options.holdingpen_admin:
continue
member_ssh_keys = member_info['ssh_keys']
if len(member_ssh_keys) == 0:
syslog("Skipping user with no ssh keys: %s" % username)
continue
# The LDAP server on the other end requires ssh keys. If a user
# does not have them, use an obvious fake tag so they will See
# it in their profile. This solution is courtesy of Ivan at
# WinLab.
if not member_ssh_keys:
syslog('User %s has no ssh keys, using placeholder.' % (username))
member_ssh_keys = ['missing GENI ssh key']
orbit_username = self.to_orbit_name(username)
self.ensure_wimax_username(member_id, member_info)
if orbit_username not in self._orbit_users:
Expand Down

0 comments on commit 27f3343

Please sign in to comment.