Also install Heat if Sahara is being installed
Sahara now by default uses Heat backend, we should use it too. Resolves: rhbz#1269158 Change-Id: If93b0902e9b6e5dabe57c633e5c5c1e8f22eb903
This commit is contained in:
parent
06eba86fce
commit
c35f29a2ef
@ -63,7 +63,7 @@ Global Options
|
||||
Specify 'y' to install OpenStack Orchestration (heat). ['y', 'n']
|
||||
|
||||
**CONFIG_SAHARA_INSTALL**
|
||||
Specify 'y' to install OpenStack Data Processing (sahara). ['y', 'n']
|
||||
Specify 'y' to install OpenStack Data Processing (sahara). In case of sahara installation packstack also installs heat.['y', 'n']
|
||||
|
||||
**CONFIG_TROVE_INSTALL**
|
||||
Specify 'y' to install OpenStack Database (trove) ['y', 'n']
|
||||
|
@ -124,6 +124,12 @@ def process_password(param, param_name, config=None):
|
||||
return param
|
||||
|
||||
|
||||
def process_heat(param, param_name, config=None):
|
||||
if config["CONFIG_SAHARA_INSTALL"] == 'y':
|
||||
param = 'y'
|
||||
return param
|
||||
|
||||
|
||||
def process_string_nofloat(param, param_name, config=None):
|
||||
"""
|
||||
Process a string, making sure it is *not* convertible into a float
|
||||
@ -148,7 +154,6 @@ def process_bool(param, param_name, config=None):
|
||||
elif param.lower() in ('n', 'no', 'false'):
|
||||
return False
|
||||
|
||||
|
||||
# Define silent processors
|
||||
for proc_func in (process_bool, process_add_quotes_around_values):
|
||||
proc_func.silent = True
|
||||
|
@ -140,6 +140,7 @@ def initConfig(controller):
|
||||
"CONDITION": False},
|
||||
]
|
||||
update_params_usage(basedefs.PACKSTACK_DOC, parameters, sectioned=False)
|
||||
|
||||
group = {"GROUP_NAME": "Heat",
|
||||
"DESCRIPTION": "Heat Config parameters",
|
||||
"PRE_CONDITION": "CONFIG_HEAT_INSTALL",
|
||||
|
@ -207,23 +207,10 @@ def initConfig(controller):
|
||||
"NEED_CONFIRM": False,
|
||||
"CONDITION": False},
|
||||
|
||||
{"CMD_OPTION": "os-heat-install",
|
||||
"PROMPT": (
|
||||
"Should Packstack install OpenStack Orchestration (Heat)"
|
||||
),
|
||||
"OPTION_LIST": ["y", "n"],
|
||||
"VALIDATORS": [validators.validate_options],
|
||||
"DEFAULT_VALUE": "n",
|
||||
"MASK_INPUT": False,
|
||||
"LOOSE_VALIDATION": False,
|
||||
"CONF_NAME": "CONFIG_HEAT_INSTALL",
|
||||
"USE_DEFAULT": False,
|
||||
"NEED_CONFIRM": False,
|
||||
"CONDITION": False},
|
||||
|
||||
{"CMD_OPTION": "os-sahara-install",
|
||||
"PROMPT": (
|
||||
"Should Packstack install OpenStack Clustering (Sahara)"
|
||||
"Should Packstack install OpenStack Clustering (Sahara)."
|
||||
" If yes it'll also install Heat."
|
||||
),
|
||||
"OPTION_LIST": ["y", "n"],
|
||||
"VALIDATORS": [validators.validate_options],
|
||||
@ -235,6 +222,21 @@ def initConfig(controller):
|
||||
"NEED_CONFIRM": False,
|
||||
"CONDITION": False},
|
||||
|
||||
{"CMD_OPTION": "os-heat-install",
|
||||
"PROMPT": (
|
||||
"Should Packstack install OpenStack Orchestration (Heat)"
|
||||
),
|
||||
"OPTION_LIST": ["y", "n"],
|
||||
"VALIDATORS": [validators.validate_options],
|
||||
"PROCESSORS": [processors.process_heat],
|
||||
"DEFAULT_VALUE": "n",
|
||||
"MASK_INPUT": False,
|
||||
"LOOSE_VALIDATION": False,
|
||||
"CONF_NAME": "CONFIG_HEAT_INSTALL",
|
||||
"USE_DEFAULT": False,
|
||||
"NEED_CONFIRM": False,
|
||||
"CONDITION": False},
|
||||
|
||||
{"CMD_OPTION": "os-trove-install",
|
||||
"PROMPT": (
|
||||
"Should Packstack install OpenStack Database (Trove)"
|
||||
|
Loading…
Reference in New Issue
Block a user