Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: Updating default storage type question ......................................................................
packaging: setup: Updating default storage type question Previous releases handle different storage pool type, now it handles only Local/Shared. Change-Id: I1fa88c96fc7e8d799fa2bd777b951bb1e29e0703 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1102021 Signed-off-by: Simone Tiraboschi <stira...@redhat.com> --- M packaging/dbscripts/inst_sp.sql M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/ovirt_engine_setup/engine/constants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py 4 files changed, 41 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/32452/1 diff --git a/packaging/dbscripts/inst_sp.sql b/packaging/dbscripts/inst_sp.sql index 3badb02..338f584 100644 --- a/packaging/dbscripts/inst_sp.sql +++ b/packaging/dbscripts/inst_sp.sql @@ -1,15 +1,13 @@ -- The following stored procedures are relevant to oVirt Installer only -Create or replace FUNCTION inst_update_default_storage_pool_type(v_storage_pool_type INTEGER) +Create or replace FUNCTION inst_update_default_storage_pool_type(v_is_local boolean) RETURNS VOID AS $procedure$ BEGIN - if (v_storage_pool_type > 0 and v_storage_pool_type < 7) then UPDATE storage_pool - SET storage_pool_type = v_storage_pool_type, _update_date = LOCALTIMESTAMP + SET is_local = v_is_local, _update_date = LOCALTIMESTAMP WHERE storage_pool.name = 'Default' and not exists (select 1 from storage_domains where storage_domains.storage_pool_name = 'Default'); - end if; END; $procedure$ LANGUAGE plpgsql; diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 9677926..fcbb372 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -332,8 +332,8 @@ @osetupattrs( answerfile=True, - summary=True, - description=_('Datacenter storage type'), + summary=False, + description=_('Configure default datacenter as local'), ) def STORAGE_TYPE(self): return 'OVESETUP_CONFIG/storageType' @@ -341,6 +341,14 @@ @osetupattrs( answerfile=True, summary=True, + description=_('Datacenter storage type'), + ) + def STORAGE_IS_LOCAL(self): + return 'OVESETUP_CONFIG/storageIsLocal' + + @osetupattrs( + answerfile=True, + summary=True, description=_('Host FQDN'), postinstallfile=True, ) diff --git a/packaging/setup/ovirt_engine_setup/engine/constants.py b/packaging/setup/ovirt_engine_setup/engine/constants.py index ca9a3c7..b58572b 100644 --- a/packaging/setup/ovirt_engine_setup/engine/constants.py +++ b/packaging/setup/ovirt_engine_setup/engine/constants.py @@ -284,7 +284,7 @@ DEFAULT_SYSTEM_MEMCHECK_THRESHOLD = 90 DEFAULT_CONFIG_APPLICATION_MODE = 'Both' - DEFAULT_CONFIG_STORAGE_TYPE = 'NFS' + DEFAULT_CONFIG_STORAGE_IS_LOCAL = False DEFAULT_ISO_DOMAIN_NAME = 'ISO_DOMAIN' diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py index 1e9bbd7..5475998 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py @@ -30,6 +30,7 @@ from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ import constants as oengcommcons +from ovirt_engine_setup import dialog @util.export @@ -57,6 +58,10 @@ osetupcons.ConfigEnv.STORAGE_TYPE, None ) + self.environment.setdefault( + osetupcons.ConfigEnv.STORAGE_IS_LOCAL, + None + ) @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, @@ -80,24 +85,32 @@ if self.environment[ osetupcons.ConfigEnv.STORAGE_TYPE - ] is None: + ] is not None: + if self.environment[ + osetupcons.ConfigEnv.STORAGE_TYPE + ] in self.STORAGE_TYPES: + self.environment[ + osetupcons.ConfigEnv.STORAGE_IS_LOCAL + ] = False self.environment[ osetupcons.ConfigEnv.STORAGE_TYPE - ] = self.dialog.queryString( - name='OVESETUP_CONFIG_STORAGE_TYPE', + ] = None + + if self.environment[ + osetupcons.ConfigEnv.STORAGE_IS_LOCAL + ] is None: + self.environment[ + osetupcons.ConfigEnv.STORAGE_IS_LOCAL + ] = dialog.queryBoolean( + dialog=self.dialog, + name='OVESETUP_CONFIG_STORAGE_IS_LOCAL', note=_( 'Default storage type: (@VALUES@) [@DEFAULT@]: ' ), prompt=True, - validValues=( - 'NFS', - 'FC', - 'ISCSI', - 'POSIXFS', - 'GLUSTERFS', - ), - caseSensitive=False, - default=oenginecons.Defaults.DEFAULT_CONFIG_STORAGE_TYPE, + true=_('Local'), + false=_('Shared'), + default=oenginecons.Defaults.DEFAULT_CONFIG_STORAGE_IS_LOCAL, ) @plugin.event( @@ -110,11 +123,11 @@ def _misc(self): self.environment[oenginecons.EngineDBEnv.STATEMENT].execute( statement=""" - select inst_update_default_storage_pool_type (%(type)s) + select inst_update_default_storage_pool_type (%(is_local)s) """, args={ - 'type': self.STORAGE_TYPES[ - self.environment[osetupcons.ConfigEnv.STORAGE_TYPE] + 'is_local': self.environment[ + osetupcons.ConfigEnv.STORAGE_IS_LOCAL ], }, ) -- To view, visit http://gerrit.ovirt.org/32452 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fa88c96fc7e8d799fa2bd777b951bb1e29e0703 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
