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
Luna17k · Oct 20, 2015 · c35f29a · c35f29a
1 parent 06eba86
commit c35f29a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/docs/packstack.rst b/docs/packstack.rst
@@ -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']

diff --git a/packstack/installer/processors.py b/packstack/installer/processors.py
@@ -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
diff --git a/packstack/plugins/heat_650.py b/packstack/plugins/heat_650.py
@@ -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",

diff --git a/packstack/plugins/prescript_000.py b/packstack/plugins/prescript_000.py
@@ -207,30 +207,32 @@ def initConfig(controller):
              "NEED_CONFIRM": False,
              "CONDITION": False},
 
-            {"CMD_OPTION": "os-heat-install",
+            {"CMD_OPTION": "os-sahara-install",
              "PROMPT": (
-                 "Should Packstack install OpenStack Orchestration (Heat)"
+                 "Should Packstack install OpenStack Clustering (Sahara)."
+                 " If yes it'll also install Heat."
              ),
              "OPTION_LIST": ["y", "n"],
              "VALIDATORS": [validators.validate_options],
              "DEFAULT_VALUE": "n",
              "MASK_INPUT": False,
              "LOOSE_VALIDATION": False,
-             "CONF_NAME": "CONFIG_HEAT_INSTALL",
+             "CONF_NAME": "CONFIG_SAHARA_INSTALL",
              "USE_DEFAULT": False,
              "NEED_CONFIRM": False,
              "CONDITION": False},
 
-            {"CMD_OPTION": "os-sahara-install",
+            {"CMD_OPTION": "os-heat-install",
              "PROMPT": (
-                 "Should Packstack install OpenStack Clustering (Sahara)"
+                 "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_SAHARA_INSTALL",
+             "CONF_NAME": "CONFIG_HEAT_INSTALL",
              "USE_DEFAULT": False,
              "NEED_CONFIRM": False,
              "CONDITION": False},