Revision d0c8c01d lib/ssconf.py
| b/lib/ssconf.py | ||
|---|---|---|
| 41 | 41 |
|
| 42 | 42 |
SSCONF_LOCK_TIMEOUT = 10 |
| 43 | 43 |
|
| 44 |
RE_VALID_SSCONF_NAME = re.compile(r'^[-_a-z0-9]+$')
|
|
| 44 |
RE_VALID_SSCONF_NAME = re.compile(r"^[-_a-z0-9]+$")
|
|
| 45 | 45 |
|
| 46 | 46 |
|
| 47 | 47 |
class SimpleConfigReader(object): |
| ... | ... | |
| 111 | 111 |
self._ip_to_inst_by_link = {}
|
| 112 | 112 |
self._instances_ips = [] |
| 113 | 113 |
self._inst_ips_by_link = {}
|
| 114 |
c_nparams = self._config_data['cluster']['nicparams'][constants.PP_DEFAULT]
|
|
| 115 |
for iname in self._config_data['instances']:
|
|
| 116 |
instance = self._config_data['instances'][iname]
|
|
| 117 |
for nic in instance['nics']:
|
|
| 118 |
if 'ip' in nic and nic['ip']:
|
|
| 119 |
params = objects.FillDict(c_nparams, nic['nicparams'])
|
|
| 120 |
if not params['link'] in self._inst_ips_by_link:
|
|
| 121 |
self._inst_ips_by_link[params['link']] = []
|
|
| 122 |
self._ip_to_inst_by_link[params['link']] = {}
|
|
| 123 |
self._ip_to_inst_by_link[params['link']][nic['ip']] = iname
|
|
| 124 |
self._inst_ips_by_link[params['link']].append(nic['ip'])
|
|
| 114 |
c_nparams = self._config_data["cluster"]["nicparams"][constants.PP_DEFAULT]
|
|
| 115 |
for iname in self._config_data["instances"]:
|
|
| 116 |
instance = self._config_data["instances"][iname]
|
|
| 117 |
for nic in instance["nics"]:
|
|
| 118 |
if "ip" in nic and nic["ip"]:
|
|
| 119 |
params = objects.FillDict(c_nparams, nic["nicparams"])
|
|
| 120 |
if not params["link"] in self._inst_ips_by_link:
|
|
| 121 |
self._inst_ips_by_link[params["link"]] = []
|
|
| 122 |
self._ip_to_inst_by_link[params["link"]] = {}
|
|
| 123 |
self._ip_to_inst_by_link[params["link"]][nic["ip"]] = iname
|
|
| 124 |
self._inst_ips_by_link[params["link"]].append(nic["ip"])
|
|
| 125 | 125 |
|
| 126 | 126 |
self._nodes_primary_ips = [] |
| 127 | 127 |
self._mc_primary_ips = [] |
| ... | ... | |
| 310 | 310 |
raise errors.ProgrammerError("Invalid key requested from SSConf: '%s'"
|
| 311 | 311 |
% str(key)) |
| 312 | 312 |
|
| 313 |
filename = self._cfg_dir + '/' + self._SS_FILEPREFIX + key
|
|
| 313 |
filename = self._cfg_dir + "/" + self._SS_FILEPREFIX + key
|
|
| 314 | 314 |
return filename |
| 315 | 315 |
|
| 316 | 316 |
def _ReadFile(self, key, default=None): |
| ... | ... | |
| 328 | 328 |
return default |
| 329 | 329 |
raise errors.ConfigurationError("Can't read from the ssconf file:"
|
| 330 | 330 |
" '%s'" % str(err)) |
| 331 |
data = data.rstrip('\n')
|
|
| 331 |
data = data.rstrip("\n")
|
|
| 332 | 332 |
return data |
| 333 | 333 |
|
| 334 | 334 |
def WriteFiles(self, values): |
Also available in: Unified diff