x/anvil
Code Issues Proposed changes

Updated so logging is linked to /etc/X

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-17 13:57:37 -08:00
parent af52b6dcda
commit bb10cb02ac
3 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
devstack/components/glance.py
View File

@ -41,10 +41,12 @@ API_CONF = "glance-api.conf"
REG_CONF = "glance-registry.conf"
API_PASTE_CONF = 'glance-api-paste.ini'
REG_PASTE_CONF = 'glance-registry-paste.ini'
LOGGING_CONF = "logging.conf"
LOGGING_SOURCE_FN = 'logging.cnf.sample'
POLICY_JSON = 'policy.json'
CONFIGS = [API_CONF, REG_CONF, API_PASTE_CONF, REG_PASTE_CONF, POLICY_JSON]
ADJUST_CONFIGS = [API_CONF, REG_CONF, API_PASTE_CONF, REG_PASTE_CONF]
CFG_SECTION = 'DEFAULT'
CONFIGS = [API_CONF, REG_CONF, API_PASTE_CONF,
REG_PASTE_CONF, POLICY_JSON, LOGGING_CONF]
READ_CONFIGS = [API_CONF, REG_CONF, API_PASTE_CONF, REG_PASTE_CONF]
#reg, api are here as possible subcomponents
GAPI = "api"
@ -130,19 +132,24 @@ class GlanceInstaller(comp.PythonInstallComponent):
(_, bottom) = self._get_source_config(API_PASTE_CONF)
combined = [top, "### Joined here on %s with file %s" % (date.rcf8222date(), API_PASTE_CONF), bottom]
return (fn, utils.joinlinesep(*combined))
if config_fn == REG_CONF:
elif config_fn == REG_CONF:
(fn, top) = utils.load_template(self.component_name, REG_CONF)
(_, bottom) = self._get_source_config(REG_PASTE_CONF)
combined = [top, "### Joined here on %s with file %s" % (date.rcf8222date(), REG_PASTE_CONF), bottom]
return (fn, utils.joinlinesep(*combined))
if config_fn == POLICY_JSON:
elif config_fn == POLICY_JSON:
fn = sh.joinpths(self.cfgdir, POLICY_JSON)
contents = sh.load_file(fn)
return (fn, contents)
elif config_fn == LOGGING_CONF:
fn = sh.joinpths(self.cfgdir, LOGGING_SOURCE_FN)
contents = sh.load_file(fn)
return (fn, contents)
return comp.PythonInstallComponent._get_source_config(self, config_fn)
def _config_adjust(self, contents, name):
if name not in ADJUST_CONFIGS:
#even bother opening??
if name not in READ_CONFIGS:
return contents
#use config parser and
#then extract known configs that
@ -150,23 +157,23 @@ class GlanceInstaller(comp.PythonInstallComponent):
with io.BytesIO(contents) as stream:
config = cfg.IgnoreMissingConfigParser()
config.readfp(stream)
if config.getboolean('image_cache_enabled', CFG_SECTION):
cache_dir = config.get("image_cache_datadir", CFG_SECTION)
if config.getboolean('default', 'image_cache_enabled'):
cache_dir = config.get('default', "image_cache_datadir")
if cache_dir:
LOG.info("Ensuring image cache data directory %s exists "\
"(and is empty)" % (cache_dir))
#destroy then recreate the image cache directory
sh.deldir(cache_dir)
self.tracewriter.make_dir(cache_dir)
if config.get('default_store', CFG_SECTION) == 'file':
file_dir = config.get('filesystem_store_datadir', CFG_SECTION)
if config.get('default', 'default_store') == 'file':
file_dir = config.get('default', 'filesystem_store_datadir')
if file_dir:
LOG.info("Ensuring file system store directory %s exists and is empty." % (file_dir))
#delete existing images
#and recreate the image directory
sh.deldir(file_dir)
self.tracewriter.make_dir(file_dir)
log_filename = config.get('log_file', CFG_SECTION)
log_filename = config.get('default', 'log_file')
if log_filename:
LOG.info("Ensuring log file %s exists and is empty." % (log_filename))
log_dir = sh.dirname(log_filename)
@ -177,8 +184,8 @@ class GlanceInstaller(comp.PythonInstallComponent):
sh.unlink(log_filename)
sh.touch_file(log_filename)
self.tracewriter.file_touched(log_filename)
if config.getboolean('delayed_delete', CFG_SECTION):
data_dir = config.get('scrubber_datadir', CFG_SECTION)
if config.getboolean('default', 'delayed_delete'):
data_dir = config.get('default', 'scrubber_datadir')
if data_dir:
LOG.info("Ensuring scrubber data dir %s exists and is empty." % (data_dir))
#destroy then recreate the scrubber data directory

14
devstack/components/keystone.py
View File

@ -42,8 +42,9 @@ CONFIG_DIR = "etc"
#simple confs
ROOT_CONF = "keystone.conf"
CATALOG_CONF = 'default_catalog.templates'
CONFIGS = [ROOT_CONF, CATALOG_CONF]
CFG_SECTION = 'DEFAULT'
LOGGING_CONF = "logging.conf"
LOGGING_SOURCE_FN = 'logging.cnf.sample'
CONFIGS = [ROOT_CONF, CATALOG_CONF, LOGGING_CONF]
#this is a special conf
MANAGE_DATA_CONF = 'keystone_init.sh'
@ -149,7 +150,7 @@ class KeystoneInstaller(comp.PythonInstallComponent):
with io.BytesIO(contents) as stream:
config = cfg.IgnoreMissingConfigParser()
config.readfp(stream)
log_filename = config.get('log_file', CFG_SECTION)
log_filename = config.get('default', 'log_file')
if log_filename:
LOG.info("Ensuring log file %s exists and is empty." % (log_filename))
log_dir = sh.dirname(log_filename)
@ -164,6 +165,13 @@ class KeystoneInstaller(comp.PythonInstallComponent):
#nothing modified so just return the original
return contents
def _get_source_config(self, config_fn):
if config_fn == LOGGING_CONF:
fn = sh.joinpths(self.cfgdir, LOGGING_SOURCE_FN)
contents = sh.load_file(fn)
return (fn, contents)
return comp.PythonInstallComponent._get_source_config(self, config_fn)
def warm_configs(self):
for pw_key in WARMUP_PWS:
self.cfg.get("passwords", pw_key)

27
devstack/components/nova.py
View File

@ -41,7 +41,12 @@ API_CONF = 'nova.conf'
#normal conf
PASTE_CONF = 'nova-api-paste.ini'
CONFIGS = [PASTE_CONF]
PASTE_SOURCE_FN = 'api-paste.ini'
POLICY_CONF = 'policy.json'
LOGGING_SOURCE_FN = 'logging_sample.conf'
LOGGING_CONF = "logging.conf"
CONFIGS = [PASTE_CONF, POLICY_CONF, LOGGING_CONF]
ADJUST_CONFIGS = [PASTE_CONF]
#this db will be dropped then created
DB_NAME = 'nova'
@ -359,6 +364,8 @@ class NovaInstaller(comp.PythonInstallComponent):
self.tracewriter.cfg_write(tgtfn)
def _config_adjust(self, contents, config_fn):
if config_fn not in ADJUST_CONFIGS:
return contents
if config_fn == PASTE_CONF and settings.KEYSTONE in self.instances:
newcontents = contents
with io.BytesIO(contents) as stream:
@ -380,22 +387,22 @@ class NovaInstaller(comp.PythonInstallComponent):
return contents
def _get_source_config(self, config_fn):
name = config_fn
if config_fn == PASTE_CONF:
#this is named differently than what it will be stored as... arg...
srcfn = sh.joinpths(self.appdir, "etc", "nova", 'api-paste.ini')
contents = sh.load_file(srcfn)
return (srcfn, contents)
else:
return comp.PythonInstallComponent._get_source_config(self, config_fn)
name = PASTE_SOURCE_FN
elif config_fn == LOGGING_CONF:
name = LOGGING_SOURCE_FN
srcfn = sh.joinpths(self.cfgdir, "nova", name)
contents = sh.load_file(srcfn)
return (srcfn, contents)
def _get_param_map(self, config_fn):
return keystone.get_shared_params(self.cfg)
def configure(self):
am = comp.PythonInstallComponent.configure(self)
#this is a special conf so we handle it ourselves
configs_made = comp.PythonInstallComponent.configure(self)
self._generate_nova_conf()
return am + 1
return configs_made + 1
class NovaRuntime(comp.PythonRuntime):