projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LUClusterSetParams: When ipolicy is updated warn for new violations
[ganeti-local]
/
lib
/
ssconf.py
diff --git
a/lib/ssconf.py
b/lib/ssconf.py
index
67d903c
..
babd148
100644
(file)
--- a/
lib/ssconf.py
+++ b/
lib/ssconf.py
@@
-413,10
+413,15
@@
class SimpleStore(object):
return self._ReadFile(constants.SS_MASTER_NETDEV)
def GetMasterNetmask(self):
return self._ReadFile(constants.SS_MASTER_NETDEV)
def GetMasterNetmask(self):
- """Get the netdev to which we'll add the master ip.
+ """Get the master netmask.
"""
"""
- return self._ReadFile(constants.SS_MASTER_NETMASK)
+ try:
+ return self._ReadFile(constants.SS_MASTER_NETMASK)
+ except errors.ConfigurationError:
+ family = self.GetPrimaryIPFamily()
+ ipcls = netutils.IPAddress.GetClassFromIpFamily(family)
+ return ipcls.iplen
def GetMasterNode(self):
"""Get the hostname of the master node for this cluster.
def GetMasterNode(self):
"""Get the hostname of the master node for this cluster.