From ead90d70cfffe7b8793550e04de12572282b9812 Mon Sep 17 00:00:00 2001 From: Sandro Mathys Date: Tue, 16 Apr 2013 19:46:58 +0200 Subject: [PATCH] Only add RHEL specific options to the answer file when run on RHEL 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 --- packstack/plugins/serverprep_901.py | 46 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/packstack/plugins/serverprep_901.py b/packstack/plugins/serverprep_901.py index 286d3ca7f..010f141dc 100644 --- a/packstack/plugins/serverprep_901.py +++ b/packstack/plugins/serverprep_901.py @@ -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)