Setup mixin for novnc component
This commit is contained in:
parent
63e0384de5
commit
992a5c78af
@ -33,17 +33,9 @@ APP_OPTIONS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class NoVNCUninstaller(comp.PythonUninstallComponent):
|
class NoVNCMixin(object):
|
||||||
def __init__(self, *args, **kargs):
|
def known_options(self):
|
||||||
comp.PythonUninstallComponent.__init__(self, *args, **kargs)
|
return set(['nova'])
|
||||||
|
|
||||||
|
|
||||||
class NoVNCInstaller(comp.PythonInstallComponent):
|
|
||||||
def __init__(self, *args, **kargs):
|
|
||||||
comp.PythonInstallComponent.__init__(self, *args, **kargs)
|
|
||||||
|
|
||||||
def _get_python_directories(self):
|
|
||||||
return dict()
|
|
||||||
|
|
||||||
def _get_download_locations(self):
|
def _get_download_locations(self):
|
||||||
places = list()
|
places = list()
|
||||||
@ -54,7 +46,20 @@ class NoVNCInstaller(comp.PythonInstallComponent):
|
|||||||
return places
|
return places
|
||||||
|
|
||||||
|
|
||||||
class NoVNCRuntime(comp.ProgramRuntime):
|
class NoVNCUninstaller(NoVNCMixin, comp.PythonUninstallComponent):
|
||||||
|
def __init__(self, *args, **kargs):
|
||||||
|
comp.PythonUninstallComponent.__init__(self, *args, **kargs)
|
||||||
|
|
||||||
|
|
||||||
|
class NoVNCInstaller(NoVNCMixin, comp.PythonInstallComponent):
|
||||||
|
def __init__(self, *args, **kargs):
|
||||||
|
comp.PythonInstallComponent.__init__(self, *args, **kargs)
|
||||||
|
|
||||||
|
def _get_python_directories(self):
|
||||||
|
return dict()
|
||||||
|
|
||||||
|
|
||||||
|
class NoVNCRuntime(NoVNCMixin, comp.ProgramRuntime):
|
||||||
def __init__(self, *args, **kargs):
|
def __init__(self, *args, **kargs):
|
||||||
comp.ProgramRuntime.__init__(self, *args, **kargs)
|
comp.ProgramRuntime.__init__(self, *args, **kargs)
|
||||||
|
|
||||||
@ -67,9 +72,6 @@ class NoVNCRuntime(comp.ProgramRuntime):
|
|||||||
})
|
})
|
||||||
return apps
|
return apps
|
||||||
|
|
||||||
def known_options(self):
|
|
||||||
return set(['nova'])
|
|
||||||
|
|
||||||
def _get_param_map(self, app_name):
|
def _get_param_map(self, app_name):
|
||||||
root_params = comp.ProgramRuntime._get_param_map(self, app_name)
|
root_params = comp.ProgramRuntime._get_param_map(self, app_name)
|
||||||
if app_name == VNC_PROXY_APP and 'nova' in self.options:
|
if app_name == VNC_PROXY_APP and 'nova' in self.options:
|
||||||
|
Loading…
Reference in New Issue
Block a user