Revision 15df79ad
b/lib/config.py | ||
---|---|---|
1741 | 1741 |
self._config_data.nodegroups.values()] |
1742 | 1742 |
nodegroups_data = fn(utils.NiceSort(nodegroups)) |
1743 | 1743 |
|
1744 |
return {
|
|
1744 |
ssconf_values = {
|
|
1745 | 1745 |
constants.SS_CLUSTER_NAME: cluster.cluster_name, |
1746 | 1746 |
constants.SS_CLUSTER_TAGS: cluster_tags, |
1747 | 1747 |
constants.SS_FILE_STORAGE_DIR: cluster.file_storage_dir, |
... | ... | |
1764 | 1764 |
constants.SS_UID_POOL: uid_pool, |
1765 | 1765 |
constants.SS_NODEGROUPS: nodegroups_data, |
1766 | 1766 |
} |
1767 |
bad_values = [(k, v) for k, v in ssconf_values.items() |
|
1768 |
if not isinstance(v, (str, basestring))] |
|
1769 |
if bad_values: |
|
1770 |
err = utils.CommaJoin("%s=%s" % (k, v) for k, v in bad_values) |
|
1771 |
raise errors.ConfigurationError("Some ssconf key(s) have non-string" |
|
1772 |
" values: %s" % err) |
|
1773 |
return ssconf_values |
|
1767 | 1774 |
|
1768 | 1775 |
@locking.ssynchronized(_config_lock, shared=1) |
1769 | 1776 |
def GetSsconfValues(self): |
Also available in: Unified diff