Remove needless variables.

cl_install_scratch_action
os_install_scratch_action
cl_assemble_prepare_action
netsetup
Mike Hiretsky 13 years ago
parent 8f95493d60
commit ff7f34de40

@ -64,8 +64,6 @@ class fillVars(object, glob_attr):
def get_cl_install_merge_action(self):
"""Need perform templates for install:merge or install:unmerge"""
if self.Get('cl_assemble_prepare_action') != "":
return ""
actionsMap = {'merge':'up',
'system':'up'}
cl_action = self.Get('cl_action')
@ -76,8 +74,6 @@ class fillVars(object, glob_attr):
def get_cl_install_system_action(self):
"""Need perform templates for install:system"""
if self.Get('cl_assemble_prepare_action') != "":
return ""
if self.Get('cl_action') == 'system' and \
self.Get('os_install_root_type') != "flash":
return "up"
@ -92,20 +88,6 @@ class fillVars(object, glob_attr):
return "up"
return ""
def get_cl_install_scratch_action(self):
"""Need perform templates for install:system"""
if self.Get('cl_assemble_prepare_action') != "":
return ""
if self.Get('cl_action') in ('system','merge') and \
self.Get('os_install_scratch') == "on":
return "up"
else:
return ""
def get_cl_assemble_prepare_action(self):
"""Need perform templates for assemble:prepare"""
return ""
def get_os_net_interfaces_info(self):
"""Информация о существующих сетевых интерфейсах"""
netInterfaces=self.Get("os_net_interfaces")

@ -34,21 +34,12 @@ class Data:
# need perform templates for install:merge or install:unmerge
cl_install_merge_action = {}
# need perform templates for assemble:prepare
cl_assemble_prepare_action = {'mode':'w'}
# need perform templates for install:system
cl_install_system_action = {}
# need perform templates for install:scratch
cl_install_scratch_action = {}
# need perform templates for install:flash
cl_install_flash_action = {}
# TODO: depricated
os_install_scratch_action = {'hide':True}
# install maching architecture
os_install_arch_machine = {'mode':'w'}

Loading…
Cancel
Save