From b524af4c8bdcee32b299083fc05f76d6d79fed71 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 10 Feb 2012 12:59:06 -0800 Subject: [PATCH] Fixed nova runtime components. --- devstack/components/nova.py | 7 +++++-- devstack/settings.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/devstack/components/nova.py b/devstack/components/nova.py index d6ea4386..b1327d3f 100644 --- a/devstack/components/nova.py +++ b/devstack/components/nova.py @@ -189,6 +189,7 @@ class NovaUninstaller(comp.PythonUninstallComponent): def __init__(self, *args, **kargs): comp.PythonUninstallComponent.__init__(self, TYPE, *args, **kargs) self.bindir = sh.joinpths(self.appdir, BIN_DIR) + self.cfgdir = sh.joinpths(self.appdir, CONFIG_DIR) def pre_uninstall(self): self._clear_iptables() @@ -361,6 +362,8 @@ class NovaInstaller(comp.PythonInstallComponent): class NovaRuntime(comp.PythonRuntime): def __init__(self, *args, **kargs): comp.PythonRuntime.__init__(self, TYPE, *args, **kargs) + self.cfgdir = sh.joinpths(self.appdir, CONFIG_DIR) + self.bindir = sh.joinpths(self.appdir, BIN_DIR) def _get_apps_to_start(self): result = list() @@ -369,7 +372,7 @@ class NovaRuntime(comp.PythonRuntime): for app_name in apps: result.append({ 'name': app_name, - 'path': sh.joinpths(self.appdir, BIN_DIR, app_name), + 'path': sh.joinpths(self.bindir, app_name), }) else: for short_name in self.component_opts: @@ -377,7 +380,7 @@ class NovaRuntime(comp.PythonRuntime): if full_name and full_name in APP_OPTIONS: result.append({ 'name': full_name, - 'path': sh.joinpths(self.appdir, BIN_DIR, full_name), + 'path': sh.joinpths(self.bindir, full_name), }) return result diff --git a/devstack/settings.py b/devstack/settings.py index bdeae7b5..4b48ac46 100644 --- a/devstack/settings.py +++ b/devstack/settings.py @@ -69,7 +69,8 @@ COMPONENT_NAMES = [ # When a component is asked for it may # need another component, that dependency -# mapping is listed here +# mapping is listed here. A topological sort +# will be applied to determine the exact order. COMPONENT_DEPENDENCIES = { DB: [], KEYSTONE_CLIENT: [],