x/packstack
Code Issues Proposed changes

Only add RHEL specific options to the answer file when run on RHEL

Browse Source 
While reversing parts of the previous patch on this topic since
they seemed to be too granular, this will make sure RHEL specific
questions are never asked on other linux distributions.

Change-Id: I8790c5a8cf0d97ba2a370c24584b8120aa8a9963
This commit is contained in:
Sandro Mathys
2013-04-16 19:46:58 +02:00
parent 7ef0830ae7
commit ead90d70cf
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
packstack/plugins/serverprep_901.py
View File

@@ -229,9 +229,6 @@ def initConfig(controllerObject):
"NEED_CONFIRM" : False,
"CONDITION" : False }]}
def is_on_rhel(config):
return is_rhel()
def filled_satellite(config):
return bool(config.get('CONFIG_SATELLITE_URL'))
@@ -245,29 +242,30 @@ def initConfig(controllerObject):
"PRE_CONDITION_MATCH" : "yes",
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True},
{"GROUP_NAME" : "RHEL",
"DESCRIPTION" : "RHEL config",
"PRE_CONDITION" : is_on_rhel,
"PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True},
{"GROUP_NAME" : "SATELLITE",
"DESCRIPTION" : "RHN Satellite config",
"PRE_CONDITION" : filled_satellite,
"PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True},
{"GROUP_NAME" : "SATELLITE_PROXY",
"DESCRIPTION" : "RHN Satellite proxy config",
"PRE_CONDITION" : filled_satellite_proxy,
"PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True},
]
if is_rhel():
conf_groups.append({"GROUP_NAME" : "RHEL",
"DESCRIPTION" : "RHEL config",
"PRE_CONDITION" : utils.returnYes,
"PRE_CONDITION_MATCH" : "yes",
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True})
conf_groups.append({"GROUP_NAME" : "SATELLITE",
"DESCRIPTION" : "RHN Satellite config",
"PRE_CONDITION" : filled_satellite,
"PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True})
conf_groups.append({"GROUP_NAME" : "SATELLITE_PROXY",
"DESCRIPTION" : "RHN Satellite proxy config",
"PRE_CONDITION" : filled_satellite_proxy,
"PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True})
for group in conf_groups:
paramList = conf_params[group["GROUP_NAME"]]
controller.addGroup(group, paramList)