Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: reorg the per component directory ......................................................................
packaging: setup: reorg the per component directory no reason to have cryptic names within hierarchy. engine_common/enginecommonconfig.py.in -> engine_common/config.py.in engine_common/enginecommonconstants.py -> engine_common/constants.py engine/engineconfig.py.in -> engine/config.py.in engine/engineconstants.py -> engine/constants.py Change-Id: I2f044b4c6170083337d051eafeba8c623faed845 Signed-off-by: Alon Bar-Lev <[email protected]> --- M .gitignore M Makefile R packaging/setup/ovirt_engine_setup/engine/config.py.in R packaging/setup/ovirt_engine_setup/engine/constants.py M packaging/setup/ovirt_engine_setup/engine/vdcoption.py R packaging/setup/ovirt_engine_setup/engine_common/config.py.in R packaging/setup/ovirt_engine_setup/engine_common/constants.py M packaging/setup/ovirt_engine_setup/engine_common/postgres.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/pgpass.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py M packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/sysctl.py M packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/dialog/titles.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/sysctl.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py M packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py 70 files changed, 115 insertions(+), 115 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/28602/1 diff --git a/.gitignore b/.gitignore index 681d34b..53772b6 100644 --- a/.gitignore +++ b/.gitignore @@ -64,8 +64,8 @@ packaging/services/*/config.py packaging/setup/bin/ovirt-engine-setup.env packaging/setup/ovirt_engine_setup/config.py -packaging/setup/ovirt_engine_setup/engine/engineconfig.py -packaging/setup/ovirt_engine_setup/engine_common/enginecommonconfig.py +packaging/setup/ovirt_engine_setup/engine/config.py +packaging/setup/ovirt_engine_setup/engine_common/config.py packaging/sys-etc/logrotate.d/ovirt-engine packaging/sys-etc/logrotate.d/ovirt-engine-notifier packaging/sys-etc/logrotate.d/ovirt-engine-setup diff --git a/Makefile b/Makefile index 1e6e91e..5a9a192 100644 --- a/Makefile +++ b/Makefile @@ -189,8 +189,8 @@ packaging/services/ovirt-websocket-proxy/ovirt-websocket-proxy.sysv \ packaging/setup/bin/ovirt-engine-setup.env \ packaging/setup/ovirt_engine_setup/config.py \ - packaging/setup/ovirt_engine_setup/engine/engineconfig.py \ - packaging/setup/ovirt_engine_setup/engine_common/enginecommonconfig.py \ + packaging/setup/ovirt_engine_setup/engine/config.py \ + packaging/setup/ovirt_engine_setup/engine_common/config.py \ packaging/sys-etc/logrotate.d/ovirt-engine \ packaging/sys-etc/logrotate.d/ovirt-engine-notifier \ packaging/sys-etc/logrotate.d/ovirt-engine-setup \ diff --git a/packaging/setup/ovirt_engine_setup/engine/engineconfig.py.in b/packaging/setup/ovirt_engine_setup/engine/config.py.in similarity index 100% rename from packaging/setup/ovirt_engine_setup/engine/engineconfig.py.in rename to packaging/setup/ovirt_engine_setup/engine/config.py.in diff --git a/packaging/setup/ovirt_engine_setup/engine/engineconstants.py b/packaging/setup/ovirt_engine_setup/engine/constants.py similarity index 96% rename from packaging/setup/ovirt_engine_setup/engine/engineconstants.py rename to packaging/setup/ovirt_engine_setup/engine/constants.py index 99a7f28..01cef32 100644 --- a/packaging/setup/ovirt_engine_setup/engine/engineconstants.py +++ b/packaging/setup/ovirt_engine_setup/engine/constants.py @@ -32,7 +32,7 @@ from ovirt_engine_setup.constants import osetupattrs -from . import engineconfig +from . import config @util.export @@ -41,18 +41,18 @@ LOCALSTATEDIR = '/var' DATADIR = '/usr/share' - OVIRT_ENGINE_SYSCONFDIR = engineconfig.ENGINE_SYSCONFDIR - OVIRT_ENGINE_PKIDIR = engineconfig.ENGINE_PKIDIR - OVIRT_ENGINE_DATADIR = engineconfig.ENGINE_DATADIR - OVIRT_ENGINE_LOCALSTATEDIR = engineconfig.ENGINE_LOCALSTATEDIR - OVIRT_ENGINE_LOGDIR = engineconfig.ENGINE_LOG - OVIRT_ENGINE_SERVICE_CONFIG = engineconfig.ENGINE_SERVICE_CONFIG + OVIRT_ENGINE_SYSCONFDIR = config.ENGINE_SYSCONFDIR + OVIRT_ENGINE_PKIDIR = config.ENGINE_PKIDIR + OVIRT_ENGINE_DATADIR = config.ENGINE_DATADIR + OVIRT_ENGINE_LOCALSTATEDIR = config.ENGINE_LOCALSTATEDIR + OVIRT_ENGINE_LOGDIR = config.ENGINE_LOG + OVIRT_ENGINE_SERVICE_CONFIG = config.ENGINE_SERVICE_CONFIG OVIRT_ENGINE_SERVICE_CONFIG_DEFAULTS = \ - engineconfig.ENGINE_SERVICE_CONFIG_DEFAULTS + config.ENGINE_SERVICE_CONFIG_DEFAULTS OVIRT_ENGINE_WEBSOCKET_PROXY_CONFIG = \ - engineconfig.ENGINE_WEBSOCKET_PROXY_CONFIG + config.ENGINE_WEBSOCKET_PROXY_CONFIG OVIRT_ENGINE_NOTIFIER_SERVICE_CONFIG = \ - engineconfig.ENGINE_NOTIFIER_SERVICE_CONFIG + config.ENGINE_NOTIFIER_SERVICE_CONFIG OVIRT_ENGINE_BINDIR = os.path.join( OVIRT_ENGINE_DATADIR, diff --git a/packaging/setup/ovirt_engine_setup/engine/vdcoption.py b/packaging/setup/ovirt_engine_setup/engine/vdcoption.py index 0b97032..5075ed0 100644 --- a/packaging/setup/ovirt_engine_setup/engine/vdcoption.py +++ b/packaging/setup/ovirt_engine_setup/engine/vdcoption.py @@ -28,7 +28,7 @@ from otopi import util -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/ovirt_engine_setup/engine_common/enginecommonconfig.py.in b/packaging/setup/ovirt_engine_setup/engine_common/config.py.in similarity index 100% rename from packaging/setup/ovirt_engine_setup/engine_common/enginecommonconfig.py.in rename to packaging/setup/ovirt_engine_setup/engine_common/config.py.in diff --git a/packaging/setup/ovirt_engine_setup/engine_common/enginecommonconstants.py b/packaging/setup/ovirt_engine_setup/engine_common/constants.py similarity index 98% rename from packaging/setup/ovirt_engine_setup/engine_common/enginecommonconstants.py rename to packaging/setup/ovirt_engine_setup/engine_common/constants.py index f2a39bf..9a4c1f3 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/enginecommonconstants.py +++ b/packaging/setup/ovirt_engine_setup/engine_common/constants.py @@ -27,7 +27,7 @@ from otopi import util -from . import enginecommonconfig +from . import config from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.constants import classproperty from ovirt_engine_setup.constants import osetupattrsclass @@ -36,7 +36,7 @@ @util.export class FileLocations(object): - OVIRT_ENGINE_COMMON_DATADIR = enginecommonconfig.ENGINE_COMMON_DATADIR + OVIRT_ENGINE_COMMON_DATADIR = config.ENGINE_COMMON_DATADIR JBOSS_HOME = os.path.join( osetupcons.FileLocations.DATADIR, diff --git a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py index f99ffe2..6723520 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py +++ b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py @@ -35,7 +35,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import util as osetuputil diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py index 8ad7ce2..b6c7f79 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py @@ -26,7 +26,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py index dfdaf63..b4d2931 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py index 2695dee..5f649b7 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py @@ -29,7 +29,7 @@ from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine_common import database diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/pgpass.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/pgpass.py index 7b55db5..a28d7a7 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/pgpass.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/pgpass.py @@ -28,7 +28,7 @@ from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine_common import database diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py index bddbbca..21de026 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py index 94349ad..ed54c6d 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py @@ -31,7 +31,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py index a2b5f6e..3410186 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py @@ -28,7 +28,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py index 40f7a1a..b02b50b 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py @@ -25,7 +25,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py index a881948..57d0b75 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py @@ -31,9 +31,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine_common import database diff --git a/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py b/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py index 54d1188..01d0d0b 100644 --- a/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py +++ b/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py @@ -28,7 +28,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py index d71e55a..91ad6dd 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py @@ -32,9 +32,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import util as osetuputil diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py index 90c8230..6e12c0a 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py @@ -28,9 +28,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py index e1ca950..e2d900b 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/sysctl.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/sysctl.py index f34eb41..3a4343c 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/sysctl.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/sysctl.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py b/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py index 486c715..9ad7368 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py +++ b/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py @@ -28,7 +28,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py index a949e2f..d92d96d 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py @@ -32,7 +32,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine_common import database from ovirt_engine_setup.engine import vdcoption from ovirt_engine_setup import domains diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py index 5a7a0ca..92d964c 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py @@ -29,9 +29,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py index d2a497a..0a4e31e 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py @@ -39,9 +39,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py index fdb1811..8aadfe2 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py @@ -36,7 +36,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py index 47d8be1..15a50b5 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py @@ -31,9 +31,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py index 53ecc37..f504ecc 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py @@ -32,7 +32,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py index 9e8e6a6..486708e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py @@ -31,7 +31,7 @@ from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py index cd0fc8f..9563441 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py @@ -29,7 +29,7 @@ from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py index 4e98c4a..2ac1dbe 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py @@ -31,7 +31,7 @@ from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import util as osetuputil from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py index 44bd59b..cf65626 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/provisioning/postgres.py @@ -28,7 +28,7 @@ from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py index ea3f22a..bcddaa5 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py @@ -31,9 +31,9 @@ from otopi import constants as otopicons from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py index 1e3e0af..5cc7857 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py @@ -28,7 +28,7 @@ from otopi import plugin -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py index 7928d3f..64c516d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py index fda4695..d8cafab 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py @@ -34,9 +34,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py index 4848557..621fec3 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py @@ -33,9 +33,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import domains as osetupdomains diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py index 6c94cf2..0587299 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py @@ -31,9 +31,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import config as osetupconfig from ovirt_engine_setup.engine import vdcoption diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py index 7630210..1bc79e8 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py @@ -33,9 +33,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py index e9f05ad..320e362 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py @@ -27,7 +27,7 @@ from otopi import plugin -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py index 35fb78b..7ac7a32 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py @@ -30,9 +30,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py index 1532f24..8c211b4 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py @@ -31,9 +31,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import dialog from ovirt_engine_setup import util as osetuputil diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py index 84cd00a..fcdf2eb 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py @@ -28,10 +28,10 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine import vdcoption from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py index c9125df..d912fa3 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py @@ -33,9 +33,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py index 57fb344..01895ce 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py @@ -33,9 +33,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export 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 611c329..4ddb3aa 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 @@ -27,9 +27,9 @@ from otopi import plugin from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py index 7de0df2..de6ca89 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py @@ -29,9 +29,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py index 224cfad..467d0bc 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py @@ -36,9 +36,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import domains as osetupdomains from ovirt_engine_setup import util as osetuputil diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py index e9d3dbd..478b18e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py @@ -30,9 +30,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py index ab2f565..ee308d9 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py @@ -29,9 +29,9 @@ from ovirt_engine_setup.engine import vdcoption -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py index 55744d5..0dbeed9 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py @@ -29,9 +29,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import dialog from ovirt_engine_setup.engine import vdcoption diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py index 31080c7..f388a05 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py @@ -30,9 +30,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py index cc2eaf3..696087b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py index c5846b3..91d7583 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py @@ -31,9 +31,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py index 4752a47..9207eec 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py @@ -31,9 +31,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine_common import database diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/dialog/titles.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/dialog/titles.py index 2d73092..313a786 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/dialog/titles.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/dialog/titles.py @@ -29,9 +29,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py index 43f9a1c..208e698 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py index 8e6b3aa..e816e22 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py @@ -32,10 +32,10 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine import vdcoption from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py index 3208ac7..4702670 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py @@ -40,9 +40,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine import vdcoption from ovirt_engine_setup import util as osetuputil diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py index 153b3b8..5e0e881 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py @@ -37,9 +37,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py index 599374b..fd7e477 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import dialog from ovirt_engine_setup.engine_common import postgres diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py index f585338..3c5e50e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py @@ -28,9 +28,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py index 2cbd3bd..4819da9 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py @@ -32,7 +32,7 @@ from otopi import filetransaction from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py index cc15f98..24d53fa 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py @@ -30,7 +30,7 @@ from otopi import plugin from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py index 3bd0e20..392cf56 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py @@ -34,9 +34,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import util as osetuputil from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/sysctl.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/sysctl.py index 24091e3..2ba92f0 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/sysctl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/sysctl.py @@ -30,9 +30,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py index 345fe5e..9fd9b9d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py @@ -30,9 +30,9 @@ from otopi import base -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup.engine_common import database diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py index 5e0ddfa..4238e0f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py @@ -28,9 +28,9 @@ from otopi import plugin -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py index 8b14191..d407b26 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py @@ -31,9 +31,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import engineconstants as oenginecons +from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common \ - import enginecommonconstants as oengcommcons + import constants as oengcommcons from ovirt_engine_setup import dialog -- To view, visit http://gerrit.ovirt.org/28602 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f044b4c6170083337d051eafeba8c623faed845 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
