Skip to content

Commit

Permalink
SM: rectify private_key check
Browse files Browse the repository at this point in the history
Closes-bug: #1641014

if user re-adds json with ssh_public_key, it causes ssh_private_key
to reset to None

Change-Id: Ic52ee5880873e4a04c93ec272331fa1fd3dbfb49
  • Loading branch information
Dheeraj Gautam committed Nov 11, 2016
1 parent 0039176 commit c398150
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/server_mgr_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ def modify_server(self, server_data):
for k,v in server_tags.iteritems():
server_data[rev_tags_dict[k]] = v

if "ssh_private_key" and "ssh_public_key" in server_data:
if "ssh_private_key" in server_data and "ssh_public_key" in server_data:
private_key = str(server_data.pop("ssh_private_key", None))
public_key = str(server_data.pop("ssh_public_key", None))
server_data["ssh_private_key"] = private_key
Expand Down

0 comments on commit c398150

Please sign in to comment.