From 1facaf11e89f9ed23c3df7e4755bb250cb32930a Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 23 Oct 2012 18:01:12 +0200
Subject: [PATCH] tools.prepare_node_join: Fix pep8 errors
Pep8 didn't agree with the indentation.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/tools/prepare_node_join.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/tools/prepare_node_join.py b/lib/tools/prepare_node_join.py
index 62e9886d8..ec93568b4 100644
--- a/lib/tools/prepare_node_join.py
+++ b/lib/tools/prepare_node_join.py
@@ -41,13 +41,15 @@ from ganeti import ssh
from ganeti import ssconf
-_SSH_KEY_LIST = \
- ht.TListOf(ht.TAnd(ht.TIsLength(3),
- ht.TItems([
- ht.TElemOf(constants.SSHK_ALL),
- ht.Comment("public")(ht.TNonEmptyString),
- ht.Comment("private")(ht.TNonEmptyString),
- ])))
+_SSH_KEY_LIST_ITEM = \
+ ht.TAnd(ht.TIsLength(3),
+ ht.TItems([
+ ht.TElemOf(constants.SSHK_ALL),
+ ht.Comment("public")(ht.TNonEmptyString),
+ ht.Comment("private")(ht.TNonEmptyString),
+ ]))
+
+_SSH_KEY_LIST = ht.TListOf(_SSH_KEY_LIST_ITEM)
_DATA_CHECK = ht.TStrictDict(False, True, {
constants.SSHS_CLUSTER_NAME: ht.TNonEmptyString,
@@ -67,7 +69,7 @@ _SSH_DAEMON_KEYFILES = {
(pathutils.SSH_HOST_RSA_PUB, pathutils.SSH_HOST_RSA_PRIV),
constants.SSHK_DSA:
(pathutils.SSH_HOST_DSA_PUB, pathutils.SSH_HOST_DSA_PRIV),
- }
+ }
assert frozenset(_SSHK_TO_SSHAK.keys()) == constants.SSHK_ALL
assert frozenset(_SSHK_TO_SSHAK.values()) == constants.SSHAK_ALL
--
GitLab