projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ConfigWriter._DistributeConfig error handling
[ganeti-local]
/
lib
/
ssconf.py
diff --git
a/lib/ssconf.py
b/lib/ssconf.py
index
c36aa65
..
cce1141
100644
(file)
--- a/
lib/ssconf.py
+++ b/
lib/ssconf.py
@@
-126,12
+126,17
@@
class SimpleStore(object):
_SS_FILEPREFIX = "ssconf_"
_VALID_KEYS = (
constants.SS_CLUSTER_NAME,
_SS_FILEPREFIX = "ssconf_"
_VALID_KEYS = (
constants.SS_CLUSTER_NAME,
+ constants.SS_CLUSTER_TAGS,
constants.SS_FILE_STORAGE_DIR,
constants.SS_MASTER_CANDIDATES,
constants.SS_MASTER_IP,
constants.SS_MASTER_NETDEV,
constants.SS_MASTER_NODE,
constants.SS_NODE_LIST,
constants.SS_FILE_STORAGE_DIR,
constants.SS_MASTER_CANDIDATES,
constants.SS_MASTER_IP,
constants.SS_MASTER_NETDEV,
constants.SS_MASTER_NODE,
constants.SS_NODE_LIST,
+ constants.SS_OFFLINE_NODES,
+ constants.SS_ONLINE_NODES,
+ constants.SS_INSTANCE_LIST,
+ constants.SS_RELEASE_VERSION,
)
_MAX_SIZE = 131072
)
_MAX_SIZE = 131072
@@
-187,7
+192,7
@@
class SimpleStore(object):
for name, value in values.iteritems():
if value and not value.endswith("\n"):
value += "\n"
for name, value in values.iteritems():
if value and not value.endswith("\n"):
value += "\n"
- utils.WriteFile(self.KeyToFilename(name), data=value)
+ utils.WriteFile(self.KeyToFilename(name), data=value, mode=0444)
finally:
ssconf_lock.Unlock()
finally:
ssconf_lock.Unlock()