From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 23 Sep 2010 10:44:40 +0000 (+0200)
Subject: hotfix: the ssh_key for slivers was not properly compared, and was
X-Git-Tag: nodemanager-2.0-19~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=a857692c3e16649aa536be13dd6979569bd74c46;p=nodemanager.git

hotfix: the ssh_key for slivers was not properly compared, and was
causing a storm of UpdateSliceTags
---

diff --git a/plugins/sliverauth.py b/plugins/sliverauth.py
index 51f44c9..a02b5e3 100644
--- a/plugins/sliverauth.py
+++ b/plugins/sliverauth.py
@@ -108,7 +108,7 @@ def generate_sshkey (sliver):
         logger.log_call( [ 'ssh-keygen', '-t', 'rsa', '-N', '', '-f', keyfile , '-C', comment] )
         os.chmod (keyfile, 0400)
         logger.log_call ( [ 'chown', "%s:slices"%(sliver['name']), keyfile, pubfile ] )
-    return file(pubfile).read()
+    return file(pubfile).read().strip()
 
 # a sliver can get created, deleted and re-created
 # the slice having the tag is not sufficient to skip key geneneration