Revision 1facaf11

b/lib/tools/prepare_node_join.py
41 41
from ganeti import ssconf
42 42

  
43 43

  
44
_SSH_KEY_LIST = \
45
  ht.TListOf(ht.TAnd(ht.TIsLength(3),
46
                     ht.TItems([
47
                       ht.TElemOf(constants.SSHK_ALL),
48
                       ht.Comment("public")(ht.TNonEmptyString),
49
                       ht.Comment("private")(ht.TNonEmptyString),
50
                       ])))
44
_SSH_KEY_LIST_ITEM = \
45
  ht.TAnd(ht.TIsLength(3),
46
          ht.TItems([
47
            ht.TElemOf(constants.SSHK_ALL),
48
            ht.Comment("public")(ht.TNonEmptyString),
49
            ht.Comment("private")(ht.TNonEmptyString),
50
          ]))
51

  
52
_SSH_KEY_LIST = ht.TListOf(_SSH_KEY_LIST_ITEM)
51 53

  
52 54
_DATA_CHECK = ht.TStrictDict(False, True, {
53 55
  constants.SSHS_CLUSTER_NAME: ht.TNonEmptyString,
......
67 69
    (pathutils.SSH_HOST_RSA_PUB, pathutils.SSH_HOST_RSA_PRIV),
68 70
  constants.SSHK_DSA:
69 71
    (pathutils.SSH_HOST_DSA_PUB, pathutils.SSH_HOST_DSA_PRIV),
70
    }
72
  }
71 73

  
72 74
assert frozenset(_SSHK_TO_SSHAK.keys()) == constants.SSHK_ALL
73 75
assert frozenset(_SSHK_TO_SSHAK.values()) == constants.SSHAK_ALL

Also available in: Unified diff