#
#
-# Copyright (C) 2006, 2007, 2008 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2010, 2011, 2012 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
import sys
import re
import os
+import errno
from ganeti import errors
from ganeti import constants
SSCONF_LOCK_TIMEOUT = 10
-RE_VALID_SSCONF_NAME = re.compile(r'^[-_a-z0-9]+$')
+RE_VALID_SSCONF_NAME = re.compile(r"^[-_a-z0-9]+$")
class SimpleConfigReader(object):
self._ip_to_inst_by_link = {}
self._instances_ips = []
self._inst_ips_by_link = {}
- c_nparams = self._config_data['cluster']['nicparams'][constants.PP_DEFAULT]
- for iname in self._config_data['instances']:
- instance = self._config_data['instances'][iname]
- for nic in instance['nics']:
- if 'ip' in nic and nic['ip']:
- params = objects.FillDict(c_nparams, nic['nicparams'])
- if not params['link'] in self._inst_ips_by_link:
- self._inst_ips_by_link[params['link']] = []
- self._ip_to_inst_by_link[params['link']] = {}
- self._ip_to_inst_by_link[params['link']][nic['ip']] = iname
- self._inst_ips_by_link[params['link']].append(nic['ip'])
+ c_nparams = self._config_data["cluster"]["nicparams"][constants.PP_DEFAULT]
+ for iname in self._config_data["instances"]:
+ instance = self._config_data["instances"][iname]
+ for nic in instance["nics"]:
+ if "ip" in nic and nic["ip"]:
+ params = objects.FillDict(c_nparams, nic["nicparams"])
+ if not params["link"] in self._inst_ips_by_link:
+ self._inst_ips_by_link[params["link"]] = []
+ self._ip_to_inst_by_link[params["link"]] = {}
+ self._ip_to_inst_by_link[params["link"]][nic["ip"]] = iname
+ self._inst_ips_by_link[params["link"]].append(nic["ip"])
self._nodes_primary_ips = []
self._mc_primary_ips = []
def GetMasterNetdev(self):
return self._config_data["cluster"]["master_netdev"]
+ def GetMasterNetmask(self):
+ return self._config_data["cluster"]["master_netmask"]
+
def GetFileStorageDir(self):
return self._config_data["cluster"]["file_storage_dir"]
+ def GetSharedFileStorageDir(self):
+ return self._config_data["cluster"]["shared_file_storage_dir"]
+
def GetNodeList(self):
return self._config_data["nodes"].keys()
- keys are restricted to predefined values
"""
- _SS_FILEPREFIX = "ssconf_"
_VALID_KEYS = (
constants.SS_CLUSTER_NAME,
constants.SS_CLUSTER_TAGS,
constants.SS_FILE_STORAGE_DIR,
+ constants.SS_SHARED_FILE_STORAGE_DIR,
constants.SS_MASTER_CANDIDATES,
constants.SS_MASTER_CANDIDATES_IPS,
constants.SS_MASTER_IP,
constants.SS_MASTER_NETDEV,
+ constants.SS_MASTER_NETMASK,
constants.SS_MASTER_NODE,
constants.SS_NODE_LIST,
constants.SS_NODE_PRIMARY_IPS,
constants.SS_NODE_SECONDARY_IPS,
constants.SS_OFFLINE_NODES,
constants.SS_ONLINE_NODES,
+ constants.SS_PRIMARY_IP_FAMILY,
constants.SS_INSTANCE_LIST,
constants.SS_RELEASE_VERSION,
constants.SS_HYPERVISOR_LIST,
constants.SS_MAINTAIN_NODE_HEALTH,
constants.SS_UID_POOL,
+ constants.SS_NODEGROUPS,
)
_MAX_SIZE = 131072
raise errors.ProgrammerError("Invalid key requested from SSConf: '%s'"
% str(key))
- filename = self._cfg_dir + '/' + self._SS_FILEPREFIX + key
+ filename = self._cfg_dir + "/" + constants.SSCONF_FILEPREFIX + key
return filename
- def _ReadFile(self, key):
+ def _ReadFile(self, key, default=None):
"""Generic routine to read keys.
This will read the file which holds the value requested. Errors
try:
data = utils.ReadFile(filename, size=self._MAX_SIZE)
except EnvironmentError, err:
+ if err.errno == errno.ENOENT and default is not None:
+ return default
raise errors.ConfigurationError("Can't read from the ssconf file:"
" '%s'" % str(err))
- data = data.rstrip('\n')
+ data = data.rstrip("\n")
return data
def WriteFiles(self, values):
if len(value) > self._MAX_SIZE:
raise errors.ConfigurationError("ssconf file %s above maximum size" %
name)
- utils.WriteFile(self.KeyToFilename(name), data=value, mode=0444)
+ utils.WriteFile(self.KeyToFilename(name), data=value,
+ mode=constants.SS_FILE_PERMS)
finally:
ssconf_lock.Unlock()
"""
return self._ReadFile(constants.SS_FILE_STORAGE_DIR)
+ def GetSharedFileStorageDir(self):
+ """Get the shared file storage dir.
+
+ """
+ return self._ReadFile(constants.SS_SHARED_FILE_STORAGE_DIR)
+
def GetMasterCandidates(self):
"""Return the list of master candidates.
"""
return self._ReadFile(constants.SS_MASTER_NETDEV)
+ def GetMasterNetmask(self):
+ """Get the 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.
nl = data.splitlines(False)
return nl
+ def GetNodegroupList(self):
+ """Return the list of nodegroups.
+
+ """
+ data = self._ReadFile(constants.SS_NODEGROUPS)
+ nl = data.splitlines(False)
+ return nl
+
def GetClusterTags(self):
"""Return the cluster tags.
data = self._ReadFile(constants.SS_UID_POOL)
return data
+ def GetPrimaryIPFamily(self):
+ """Return the cluster-wide primary address family.
+
+ """
+ try:
+ return int(self._ReadFile(constants.SS_PRIMARY_IP_FAMILY,
+ default=netutils.IP4Address.family))
+ except (ValueError, TypeError), err:
+ raise errors.ConfigurationError("Error while trying to parse primary ip"
+ " family: %s" % err)
+
def GetMasterAndMyself(ss=None):
"""Get the master node and my own hostname.
"""
if ss is None:
ss = SimpleStore()
- return ss.GetMasterNode(), netutils.HostInfo().name
+ return ss.GetMasterNode(), netutils.Hostname.GetSysName()
def CheckMaster(debug, ss=None):
projects / ganeti-local / blobdiff