Revision 2afc9238

b/lib/config.py
1744 1744
                  self._config_data.nodegroups.values()]
1745 1745
    nodegroups_data = fn(utils.NiceSort(nodegroups))
1746 1746

  
1747
    return {
1747
    ssconf_values = {
1748 1748
      constants.SS_CLUSTER_NAME: cluster.cluster_name,
1749 1749
      constants.SS_CLUSTER_TAGS: cluster_tags,
1750 1750
      constants.SS_FILE_STORAGE_DIR: cluster.file_storage_dir,
......
1767 1767
      constants.SS_UID_POOL: uid_pool,
1768 1768
      constants.SS_NODEGROUPS: nodegroups_data,
1769 1769
      }
1770
    bad_values = [(k, v) for k, v in ssconf_values.items()
1771
                  if not isinstance(v, (str, basestring))]
1772
    if bad_values:
1773
      err = utils.CommaJoin("%s=%s" % (k, v) for k, v in bad_values)
1774
      raise errors.ConfigurationError("Some ssconf key(s) have non-string"
1775
                                      " values: %s" % err)
1776
    return ssconf_values
1770 1777

  
1771 1778
  @locking.ssynchronized(_config_lock, shared=1)
1772 1779
  def GetSsconfValues(self):

Also available in: Unified diff