Adding new parameters to cleanup phase (#540)

Author: shalakadharap

py-utils/src/utils/setup/openldap/openldap.py

@@ -157,6 +157,8 @@ def _get_list_of_phases_to_validate(self, phase_name: str):
 
     def _expand_keys(self, key: str, phase_name: str):
         """Substitute any occurence of machine-id or other such values."""
+        if (phase_name == "CLEANUP"):
+            return key
         cluster_id_val = None
         machine_id_val = self.machine_id
         if (self.cluster_id is not None and len(self.cluster_id) != 0):

py-utils/src/utils/setup/openldap/openldap_prov_config.yaml

@@ -41,5 +41,7 @@ TEST:
   OPENLDAP_BASE_DN: "cortx>software>openldap>base_dn"
 RESET:
 CLEANUP:
+  OPENLDAP_INSTALL_DIR: "cortx>software>openldap>install_dir"
+  OPENLDAP_DATA_DIR: "cortx>software>openldap>data_dir"
 # Unsolicited Keys should be added to the bottom.
 CONFSTORE_OPENLDAP_CONST_KEY: "cortx"

py-utils/src/utils/setup/openldap/templates/openldap.cleanup.tmpl

@@ -1 +1,5 @@
-# No keys required for cleanup
+cortx:
+  software:
+    openldap:
+      install_dir: "/etc"
+      data_dir: "/var/lib/ldap"