Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: suggest path for local storage during AIO setup ......................................................................
packaging: suggest path for local storage during AIO setup When running AIO setup, the installer suggest a default location (/var/lib/images) for the Local storage domain path the same way we suggest for the local ISO domain. Renamed generateIsoDomainName in generateIsoDomainPath in engine-setup to be more accurate. Bug-Url: https://bugzilla.redhat.com/896465 Change-Id: I9ddc2810ab3a6c2c20ce8b7663a813e89312f4d1 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> (cherry picked from commit b1e0cf6614cc67d4832cf41e90e3f7898b78fd06) --- M packaging/fedora/setup/engine-setup.py M packaging/fedora/setup/plugins/all_in_one_100.py 2 files changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/11705/1 diff --git a/packaging/fedora/setup/engine-setup.py b/packaging/fedora/setup/engine-setup.py index e7bab64..e846fc3 100755 --- a/packaging/fedora/setup/engine-setup.py +++ b/packaging/fedora/setup/engine-setup.py @@ -81,9 +81,9 @@ "protocol" : ["udp"]}, ] -def generateIsoDomainName(): +def generateIsoDomainPath(): ''' - Generates name for iso domain + Generates path for iso domain ''' if os.path.exists(basedefs.DEFAULT_ISO_EXPORT_PATH): @@ -433,7 +433,7 @@ "PROMPT" :output_messages.INFO_CONF_PARAMS_NFS_MP_PROMPT, "OPTION_LIST" :[], "VALIDATION_FUNC" :validate.validateNFSMountPoint, - "DEFAULT_VALUE" :generateIsoDomainName(), + "DEFAULT_VALUE" : generateIsoDomainPath(), "MASK_INPUT" : False, "LOOSE_VALIDATION": False, "CONF_NAME" : "NFS_MP", diff --git a/packaging/fedora/setup/plugins/all_in_one_100.py b/packaging/fedora/setup/plugins/all_in_one_100.py index 8ff0c3d..22bcbdd 100644 --- a/packaging/fedora/setup/plugins/all_in_one_100.py +++ b/packaging/fedora/setup/plugins/all_in_one_100.py @@ -68,12 +68,24 @@ LOCAL_DATA_CENTER = "local_datacenter" LOCAL_HOST = "local_host" LOCAL_STORAGE = "local_storage" +LOCAL_STORAGE_PATH = "/var/lib/images" # PATH PARAMS VDSM_PATH = "/usr/share/vdsm" SHADOW_FILE = "/etc/shadow" logging.debug("plugin %s loaded", __name__) + + +def generateLocalStorageDomainPath(): + ''' + Generates name for local storage domain + ''' + if os.path.exists(LOCAL_STORAGE_PATH): + return "%s_%s" % (LOCAL_STORAGE_PATH, + utils.getCurrentDateTime()) + else: + return LOCAL_STORAGE_PATH def initConfig(controllerObject): @@ -99,7 +111,7 @@ "PROMPT" : INFO_CONF_PARAMS_LOCAL_STORAGE, "OPTION_LIST" : [], "VALIDATION_FUNC" : validateStoragePath, - "DEFAULT_VALUE" : "", + "DEFAULT_VALUE" : generateLocalStorageDomainPath(), "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "STORAGE_PATH", @@ -439,4 +451,3 @@ return None return urlContent - -- To view, visit http://gerrit.ovirt.org/11705 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ddc2810ab3a6c2c20ce8b7663a813e89312f4d1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: engine_3.2 Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
