x/anvil
Code Issues Proposed changes

Fixed nova runtime components.

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-10 12:59:06 -08:00
parent 1275a1bd39
commit b524af4c8b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/components/nova.py
View File

@ -189,6 +189,7 @@ class NovaUninstaller(comp.PythonUninstallComponent):
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):
comp.PythonUninstallComponent.__init__(self, TYPE, *args, **kargs) comp.PythonUninstallComponent.__init__(self, TYPE, *args, **kargs)
self.bindir = sh.joinpths(self.appdir, BIN_DIR) self.bindir = sh.joinpths(self.appdir, BIN_DIR)
self.cfgdir = sh.joinpths(self.appdir, CONFIG_DIR)
def pre_uninstall(self): def pre_uninstall(self):
self._clear_iptables() self._clear_iptables()
@ -361,6 +362,8 @@ class NovaInstaller(comp.PythonInstallComponent):
class NovaRuntime(comp.PythonRuntime): class NovaRuntime(comp.PythonRuntime):
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):
comp.PythonRuntime.__init__(self, TYPE, *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): def _get_apps_to_start(self):
result = list() result = list()
@ -369,7 +372,7 @@ class NovaRuntime(comp.PythonRuntime):
for app_name in apps: for app_name in apps:
result.append({ result.append({
'name': app_name, 'name': app_name,
'path': sh.joinpths(self.appdir, BIN_DIR, app_name), 'path': sh.joinpths(self.bindir, app_name),
}) })
else: else:
for short_name in self.component_opts: for short_name in self.component_opts:
@ -377,7 +380,7 @@ class NovaRuntime(comp.PythonRuntime):
if full_name and full_name in APP_OPTIONS: if full_name and full_name in APP_OPTIONS:
result.append({ result.append({
'name': full_name, 'name': full_name,
'path': sh.joinpths(self.appdir, BIN_DIR, full_name), 'path': sh.joinpths(self.bindir, full_name),
}) })
return result return result

3
devstack/settings.py
View File

@ -69,7 +69,8 @@ COMPONENT_NAMES = [
# When a component is asked for it may # When a component is asked for it may
# need another component, that dependency # 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 = { COMPONENT_DEPENDENCIES = {
DB: [], DB: [],
KEYSTONE_CLIENT: [], KEYSTONE_CLIENT: [],