Logging cleanups + some small new additions/adjustments to nova config.

This commit is contained in:
Joshua Harlow 2012-02-03 19:57:38 -08:00
parent 5c0563f6c5
commit 187e15c1ea
2 changed files with 6 additions and 3 deletions
devstack/components

@ -183,7 +183,7 @@ class DBInstaller(comp.PkgInstallComponent):
utils.execute_template(*cmds, params=params, shell=True)
except IOError:
LOG.warn(("Couldn't set your password. It might have already been "
"set by a previous process."), exc_info=True)
"set by a previous process."))
#ensure access granted
if dbactions:

@ -431,7 +431,10 @@ class NovaConfigurator(object):
self.appdir = nc.appdir
self.tracewriter = nc.tracewriter
self.paste_conf_fn = nc.paste_conf_fn
self.nvol = not nc.component_opts or NVOL in nc.component_opts
self.distro = nc.distro
self.volumes_enabled = False
if not nc.component_opts or NVOL in nc.component_opts:
self.volumes_enabled = True
def _getbool(self, name):
return self.cfg.getboolean('nova', name)
@ -463,7 +466,7 @@ class NovaConfigurator(object):
self._configure_network_settings(nova_conf, component_dirs)
#setup nova volume settings
if self.nvol:
if self.volumes_enabled:
self._configure_vols(nova_conf)
#where we are running