Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: move apache plugins to common ......................................................................
packaging: setup: move apache plugins to common Change-Id: I4d44ce21a3fc305c874bf83e9638f8340fdeaa2f Signed-off-by: Sandro Bonazzola <[email protected]> --- M .gitignore M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/ovirt_engine_setup/engine/constants.py M packaging/setup/ovirt_engine_setup/engine_common/config.py.in M packaging/setup/ovirt_engine_setup/engine_common/constants.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/__init__.py C packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.py R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/misc.py R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/root.py R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.py R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.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/__init__.py C packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/core.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py 17 files changed, 199 insertions(+), 176 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/29120/1 diff --git a/.gitignore b/.gitignore index 9dea990..6c9bd1b 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ packaging/setup/ovirt_engine_setup/config.py packaging/setup/ovirt_engine_setup/engine/config.py packaging/setup/ovirt_engine_setup/engine_common/config.py +packaging/setup/ovirt_engine_setup/websocket_proxy/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/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index ae004f0..9677926 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -190,7 +190,6 @@ SYSTEM_SYSCTL_CONFIG_AVAILABLE = 'osetup.system.sysctl.available' SYSTEM_HOSTILE_SERVICES_DETECTION = 'osetup.system.hostile.detection' - APACHE_RESTART = 'osetup.apache.core.restart' DISTRO_RPM_PACKAGE_UPDATE_CHECK = 'osetup.distro-rpm.package.update.check' DIALOG_TITLES_S_FIREWALL = 'osetup.dialog.titles.firewall.start' diff --git a/packaging/setup/ovirt_engine_setup/engine/constants.py b/packaging/setup/ovirt_engine_setup/engine/constants.py index 1f70d73..0e9a35e 100644 --- a/packaging/setup/ovirt_engine_setup/engine/constants.py +++ b/packaging/setup/ovirt_engine_setup/engine/constants.py @@ -137,10 +137,6 @@ OVIRT_ENGINE_PKIKEYSDIR, 'apache.p12', ) - OVIRT_ENGINE_PKI_APACHE_KEY = os.path.join( - OVIRT_ENGINE_PKIKEYSDIR, - 'apache.key.nopass', - ) OVIRT_ENGINE_PKI_LOCAL_WEBSOCKET_PROXY_STORE = os.path.join( OVIRT_ENGINE_PKIKEYSDIR, 'websocket-proxy.p12', @@ -160,14 +156,6 @@ OVIRT_ENGINE_PKI_ENGINE_CA_CERT = os.path.join( OVIRT_ENGINE_PKIDIR, 'ca.pem', - ) - OVIRT_ENGINE_PKI_APACHE_CA_CERT = os.path.join( - OVIRT_ENGINE_PKIDIR, - 'apache-ca.pem', - ) - OVIRT_ENGINE_PKI_APACHE_CERT = os.path.join( - OVIRT_ENGINE_PKICERTSDIR, - 'apache.cer', ) OVIRT_ENGINE_PKI_LOCAL_WEBSOCKET_PROXY_CERT = os.path.join( OVIRT_ENGINE_PKICERTSDIR, @@ -233,25 +221,11 @@ 'conf.d', 'z-ovirt-engine-proxy.conf', ) - HTTPD_CONF_OVIRT_ROOT = os.path.join( - DIR_HTTPD, - 'conf.d', - 'ovirt-engine-root-redirect.conf', - ) - HTTPD_CONF_SSL = os.path.join( - DIR_HTTPD, - 'conf.d', - 'ssl.conf', - ) + HTTPD_CONF_OVIRT_ENGINE_TEMPLATE = os.path.join( osetupcons.FileLocations.OVIRT_SETUP_DATADIR, 'conf', 'ovirt-engine-proxy.conf.v2.in', - ) - HTTPD_CONF_OVIRT_ROOT_TEMPLATE = os.path.join( - osetupcons.FileLocations.OVIRT_SETUP_DATADIR, - 'conf', - 'ovirt-engine-root-redirect.conf.in', ) OVIRT_ENGINE_SERVICE_CONFIGD = '%s.d' % OVIRT_ENGINE_SERVICE_CONFIG @@ -681,34 +655,7 @@ @osetupattrsclass class ApacheEnv(object): - HTTPD_CONF_SSL = 'OVESETUP_APACHE/configFileSsl' HTTPD_CONF_OVIRT_ENGINE = 'OVESETUP_APACHE/configFileOvirtEngine' - HTTPD_CONF_OVIRT_ROOT = 'OVESETUP_APACHE/configFileOvirtRoot' - - CONFIGURE_ROOT_REDIRECTIOND_DEFAULT = \ - 'OVESETUP_APACHE/configureRootRedirectionDefault' - - @osetupattrs( - postinstallfile=True, - ) - def CONFIGURED(self): - return 'OVESETUP_APACHE/configured' - - @osetupattrs( - answerfile=True, - summary=True, - description=_('Configure Apache SSL'), - ) - def CONFIGURE_SSL(self): - return 'OVESETUP_APACHE/configureSsl' - - @osetupattrs( - answerfile=True, - summary=True, - description=_('Set application as default page'), - ) - def CONFIGURE_ROOT_REDIRECTION(self): - return 'OVESETUP_APACHE/configureRootRedirection' @util.export diff --git a/packaging/setup/ovirt_engine_setup/engine_common/config.py.in b/packaging/setup/ovirt_engine_setup/engine_common/config.py.in index 6049c69..e9c927a 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/config.py.in +++ b/packaging/setup/ovirt_engine_setup/engine_common/config.py.in @@ -19,6 +19,7 @@ """Engine Config.""" ENGINE_COMMON_DATADIR = '@ENGINE_COMMON_USR@' +ENGINE_PKIDIR = '@ENGINE_PKI@' # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/ovirt_engine_setup/engine_common/constants.py b/packaging/setup/ovirt_engine_setup/engine_common/constants.py index a0af707..c333c48 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/constants.py +++ b/packaging/setup/ovirt_engine_setup/engine_common/constants.py @@ -39,16 +39,55 @@ class FileLocations(object): SYSCONFDIR = '/etc' OVIRT_ENGINE_COMMON_DATADIR = config.ENGINE_COMMON_DATADIR + OVIRT_ENGINE_PKIDIR = config.ENGINE_PKIDIR + OVIRT_ENGINE_PKICERTSDIR = os.path.join( + OVIRT_ENGINE_PKIDIR, + 'certs', + ) + OVIRT_ENGINE_PKIKEYSDIR = os.path.join( + OVIRT_ENGINE_PKIDIR, + 'keys', + ) + DIR_HTTPD = os.path.join( + osetupcons.FileLocations.SYSCONFDIR, + 'httpd', + ) + HTTPD_CONF_OVIRT_ROOT = os.path.join( + DIR_HTTPD, + 'conf.d', + 'ovirt-engine-root-redirect.conf', + ) + HTTPD_CONF_OVIRT_ROOT_TEMPLATE = os.path.join( + osetupcons.FileLocations.OVIRT_SETUP_DATADIR, + 'conf', + 'ovirt-engine-root-redirect.conf.in', + ) + HTTPD_CONF_SSL = os.path.join( + DIR_HTTPD, + 'conf.d', + 'ssl.conf', + ) JBOSS_HOME = os.path.join( osetupcons.FileLocations.DATADIR, 'jboss-as', ) - OVIRT_ENGINE_SYSCTL = os.path.join( SYSCONFDIR, 'sysctl.d', 'ovirt-postgresql.conf', + ) + OVIRT_ENGINE_PKI_APACHE_CA_CERT = os.path.join( + OVIRT_ENGINE_PKIDIR, + 'apache-ca.pem', + ) + OVIRT_ENGINE_PKI_APACHE_CERT = os.path.join( + OVIRT_ENGINE_PKICERTSDIR, + 'apache.cer', + ) + OVIRT_ENGINE_PKI_APACHE_KEY = os.path.join( + OVIRT_ENGINE_PKIKEYSDIR, + 'apache.key.nopass', ) @@ -111,6 +150,8 @@ @util.export class Stages(object): + APACHE_RESTART = 'osetup.apache.core.restart' + CORE_ENGINE_START = 'osetup.core.engine.start' DB_CONNECTION_SETUP = 'osetup.db.connection.setup' @@ -200,8 +241,35 @@ @util.codegen @osetupattrsclass class ApacheEnv(object): - HTTPD_SERVICE = 'OVESETUP_APACHE/httpdService' + @osetupattrs( + postinstallfile=True, + ) + def CONFIGURED(self): + return 'OVESETUP_APACHE/configured' + + @osetupattrs( + answerfile=True, + summary=True, + description=_('Set application as default page'), + ) + def CONFIGURE_ROOT_REDIRECTION(self): + return 'OVESETUP_APACHE/configureRootRedirection' + + @osetupattrs( + answerfile=True, + summary=True, + description=_('Configure Apache SSL'), + ) + def CONFIGURE_SSL(self): + return 'OVESETUP_APACHE/configureSsl' + + CONFIGURE_ROOT_REDIRECTIOND_DEFAULT = \ + 'OVESETUP_APACHE/configureRootRedirectionDefault' + ENABLE = 'OVESETUP_APACHE/enable' + HTTPD_CONF_OVIRT_ROOT = 'OVESETUP_APACHE/configFileOvirtRoot' + HTTPD_CONF_SSL = 'OVESETUP_APACHE/configFileSsl' + HTTPD_SERVICE = 'OVESETUP_APACHE/httpdService' NEED_RESTART = 'OVESETUP_APACHE/needRestart' 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 21de026..099c000 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 @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,8 +28,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons @util.export @@ -63,7 +62,7 @@ @plugin.event( stage=plugin.Stages.STAGE_CLOSEUP, - name=osetupcons.Stages.APACHE_RESTART, + name=oengcommcons.Stages.APACHE_RESTART, after=( oengcommcons.Stages.CORE_ENGINE_START, ), 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 0a4e31e..030fb3e 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,8 +40,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import dialog @@ -100,7 +99,9 @@ def _late_setup(self): if ( X509.load_cert( - file=oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT, + file=( + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT + ), format=X509.FORMAT_PEM, ).get_pubkey().get_rsa().pub() != X509.load_cert( file=oenginecons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_CERT, @@ -116,7 +117,7 @@ 'for the new host name.\n' ).format( apache_ca=( - oenginecons.FileLocations. + oengcommcons.FileLocations. OVIRT_ENGINE_PKI_APACHE_CA_CERT ), ca=( @@ -133,8 +134,8 @@ ].extend( ( oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_STORE, - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY, - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT, + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY, + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT, ) ) @@ -291,7 +292,7 @@ self.uninstall_files.extend( ( oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_STORE, - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT, + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT, ) ) @@ -303,13 +304,13 @@ self.environment[oenginecons.PKIEnv.STORE_PASS], ), '--key=%s' % ( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY, + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY, ), ), ) self.uninstall_files.append( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY, + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY, ) self.environment[ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/__init__.py new file mode 100644 index 0000000..d3fe3be --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/__init__.py @@ -0,0 +1,41 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2013-2014 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +"""ovirt-host-setup apache plugin.""" + + +from otopi import util + + +from . import core +from . import misc +from . import root +from . import selinux +from . import ssl + + [email protected] +def createPlugins(context): + core.Plugin(context=context) + misc.Plugin(context=context) + root.Plugin(context=context) + selinux.Plugin(context=context) + ssl.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.py similarity index 68% copy from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py copy to packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.py index 5e0b950..9d70dd3 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ # -"""Apache misc plugin.""" +"""Apache enable plugin.""" import gettext @@ -27,12 +27,12 @@ from otopi import plugin -from ovirt_engine_setup.engine import constants as oenginecons +from ovirt_engine_setup.engine_common import constants as oengcommcons @util.export class Plugin(plugin.PluginBase): - """Apache misc plugin.""" + """Apache enable plugin.""" def __init__(self, context): super(Plugin, self).__init__(context=context) @@ -42,17 +42,9 @@ ) def _init(self): self.environment.setdefault( - oenginecons.ApacheEnv.CONFIGURED, + oengcommcons.ApacheEnv.ENABLE, False ) - - @plugin.event( - stage=plugin.Stages.STAGE_MISC, - condition=lambda self: self.environment[oenginecons.CoreEnv.ENABLE], - priority=plugin.Stages.PRIORITY_LOW, - ) - def _misc(self): - self.environment[oenginecons.ApacheEnv.CONFIGURED] = True # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/misc.py similarity index 79% rename from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py rename to packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/misc.py index 5e0b950..4f8723b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/misc.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ from otopi import plugin -from ovirt_engine_setup.engine import constants as oenginecons +from ovirt_engine_setup.engine_common import constants as oengcommcons @util.export @@ -42,17 +42,19 @@ ) def _init(self): self.environment.setdefault( - oenginecons.ApacheEnv.CONFIGURED, + oengcommcons.ApacheEnv.CONFIGURED, False ) @plugin.event( stage=plugin.Stages.STAGE_MISC, - condition=lambda self: self.environment[oenginecons.CoreEnv.ENABLE], + condition=lambda self: self.environment[ + oengcommcons.ApacheEnv.ENABLE + ], priority=plugin.Stages.PRIORITY_LOW, ) def _misc(self): - self.environment[oenginecons.ApacheEnv.CONFIGURED] = True + self.environment[oengcommcons.ApacheEnv.CONFIGURED] = True # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/root.py similarity index 76% rename from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py rename to packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/root.py index d390a5f..9b1b822 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/root.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,9 +30,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import dialog @@ -49,15 +47,15 @@ ) def _init(self): self.environment.setdefault( - oenginecons.ApacheEnv.HTTPD_CONF_OVIRT_ROOT, - oenginecons.FileLocations.HTTPD_CONF_OVIRT_ROOT + oengcommcons.ApacheEnv.HTTPD_CONF_OVIRT_ROOT, + oengcommcons.FileLocations.HTTPD_CONF_OVIRT_ROOT ) self.environment.setdefault( - oenginecons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION, + oengcommcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION, None ) self.environment.setdefault( - oenginecons.ApacheEnv.CONFIGURE_ROOT_REDIRECTIOND_DEFAULT, + oengcommcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTIOND_DEFAULT, False ) @@ -68,14 +66,14 @@ def _setup(self): if ( self.environment[ - oenginecons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION + oengcommcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION ] is None and ( self.environment[ osetupcons.CoreEnv.DEVELOPER_MODE ] or self.environment[ - oenginecons.ApacheEnv.CONFIGURED + oengcommcons.ApacheEnv.CONFIGURED ] ) ): @@ -90,15 +88,13 @@ oengcommcons.Stages.DIALOG_TITLES_S_APACHE, ), condition=lambda self: ( - self.environment[ - oenginecons.CoreEnv.ENABLE - ] and + self.environment[oengcommcons.ApacheEnv.ENABLE] and self._enabled ), ) def _customization(self): if self.environment[ - oenginecons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION + oengcommcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION ] is None: self.dialog.note( _( @@ -108,7 +104,7 @@ ) ) self.environment[ - oenginecons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION + oengcommcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION ] = dialog.queryBoolean( dialog=self.dialog, name='OVESETUP_APACHE_CONFIG_ROOT_REDIRECTION', @@ -118,27 +114,24 @@ ), prompt=True, default=self.environment[ - oenginecons.ApacheEnv. - CONFIGURE_ROOT_REDIRECTIOND_DEFAULT + oengcommcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTIOND_DEFAULT ], ) self._enabled = self.environment[ - oenginecons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION + oengcommcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION ] @plugin.event( stage=plugin.Stages.STAGE_MISC, condition=lambda self: ( - self.environment[ - oenginecons.CoreEnv.ENABLE - ] and + self.environment[oengcommcons.ApacheEnv.ENABLE] and self._enabled ), ) def _misc(self): with open( - oenginecons.FileLocations.HTTPD_CONF_OVIRT_ROOT_TEMPLATE, + oengcommcons.FileLocations.HTTPD_CONF_OVIRT_ROOT_TEMPLATE, 'r' ) as f: content = f.read() @@ -147,7 +140,7 @@ self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( filetransaction.FileTransaction( name=self.environment[ - oenginecons.ApacheEnv.HTTPD_CONF_OVIRT_ROOT + oengcommcons.ApacheEnv.HTTPD_CONF_OVIRT_ROOT ], content=content, modifiedList=self.environment[ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/selinux.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.py similarity index 91% rename from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/selinux.py rename to packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.py index 4fd735c..7ecad0e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/selinux.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ # -"""Selinux plugin.""" +"""Apache selinux plugin.""" import gettext @@ -28,12 +28,12 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import constants as oenginecons +from ovirt_engine_setup.engine_common import constants as oengcommcons @util.export class Plugin(plugin.PluginBase): - """Selinux plugin.""" + """Apache selinux plugin.""" def __init__(self, context): super(Plugin, self).__init__(context=context) @@ -55,7 +55,7 @@ priority=plugin.Stages.PRIORITY_HIGH ) def _validation_enable(self): - if not self.environment[oenginecons.CoreEnv.ENABLE]: + if not self.environment[oengcommcons.ApacheEnv.ENABLE]: self._enabled = False @plugin.event( diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.py similarity index 83% rename from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py rename to packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.py index 2cd4492..8317f9b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ssl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.py @@ -31,9 +31,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import dialog from ovirt_engine_setup import util as osetuputil @@ -47,13 +45,13 @@ self._enabled = True self._params = { 'SSLCertificateFile': ( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT ), 'SSLCertificateKeyFile': ( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY ), 'SSLCACertificateFile': ( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT ), } @@ -62,11 +60,11 @@ ) def _init(self): self.environment.setdefault( - oenginecons.ApacheEnv.HTTPD_CONF_SSL, - oenginecons.FileLocations.HTTPD_CONF_SSL + oengcommcons.ApacheEnv.HTTPD_CONF_SSL, + oengcommcons.FileLocations.HTTPD_CONF_SSL ) self.environment.setdefault( - oenginecons.ApacheEnv.CONFIGURE_SSL, + oengcommcons.ApacheEnv.CONFIGURE_SSL, None ) @@ -77,14 +75,14 @@ def _setup(self): if ( self.environment[ - oenginecons.ApacheEnv.CONFIGURE_SSL + oengcommcons.ApacheEnv.CONFIGURE_SSL ] is None and ( self.environment[ osetupcons.CoreEnv.DEVELOPER_MODE ] or self.environment[ - oenginecons.ApacheEnv.CONFIGURED + oengcommcons.ApacheEnv.CONFIGURED ] ) ): @@ -93,7 +91,7 @@ @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, condition=lambda self: ( - self.environment[oenginecons.CoreEnv.ENABLE] and + self.environment[oengcommcons.ApacheEnv.ENABLE] and self._enabled ), before=( @@ -105,7 +103,7 @@ ) def _customization(self): if self.environment[ - oenginecons.ApacheEnv.CONFIGURE_SSL + oengcommcons.ApacheEnv.CONFIGURE_SSL ] is None: self.dialog.note( _( @@ -114,7 +112,7 @@ ) ) self.environment[ - oenginecons.ApacheEnv.CONFIGURE_SSL + oengcommcons.ApacheEnv.CONFIGURE_SSL ] = dialog.queryBoolean( dialog=self.dialog, name='OVESETUP_APACHE_CONFIG_SSL', @@ -129,13 +127,13 @@ ) self._enabled = self.environment[ - oenginecons.ApacheEnv.CONFIGURE_SSL + oengcommcons.ApacheEnv.CONFIGURE_SSL ] if self._enabled: if not os.path.exists( self.environment[ - oenginecons.ApacheEnv.HTTPD_CONF_SSL + oengcommcons.ApacheEnv.HTTPD_CONF_SSL ] ): self.logger.warning( @@ -153,7 +151,7 @@ priority=plugin.Stages.PRIORITY_HIGH, ) def _validate_enable(self): - if not self.environment[oenginecons.CoreEnv.ENABLE]: + if not self.environment[oengcommcons.ApacheEnv.ENABLE]: self._enabled = False @plugin.event( @@ -163,7 +161,7 @@ def _validate_ssl(self): with open( self.environment[ - oenginecons.ApacheEnv.HTTPD_CONF_SSL + oengcommcons.ApacheEnv.HTTPD_CONF_SSL ], 'r' ) as f: @@ -187,7 +185,7 @@ ).format( missingParams=missingParams, file=self.environment[ - oenginecons.ApacheEnv.HTTPD_CONF_SSL + oengcommcons.ApacheEnv.HTTPD_CONF_SSL ] ) ) @@ -203,7 +201,7 @@ self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( filetransaction.FileTransaction( name=self.environment[ - oenginecons.ApacheEnv.HTTPD_CONF_SSL + oengcommcons.ApacheEnv.HTTPD_CONF_SSL ], content=osetuputil.editConfigContent( content=self._sslData.splitlines(), @@ -222,14 +220,14 @@ optional=True ).addChanges( 'ssl', - self.environment[oenginecons.ApacheEnv.HTTPD_CONF_SSL], + self.environment[oengcommcons.ApacheEnv.HTTPD_CONF_SSL], changed_lines, ) self.environment[ osetupcons.CoreEnv.UNINSTALL_UNREMOVABLE_FILES ].append( self.environment[ - oenginecons.ApacheEnv.HTTPD_CONF_SSL + oengcommcons.ApacheEnv.HTTPD_CONF_SSL ] ) 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 850ffc1..637e9ab 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 @@ -32,8 +32,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import config as osetupconfig from ovirt_engine_setup.engine import vdcoption @@ -188,7 +187,7 @@ oenginecons.Stages.AIO_CONFIG_STORAGE, oenginecons.Stages.AIO_CONFIG_SSH, oengcommcons.Stages.CORE_ENGINE_START, - osetupcons.Stages.APACHE_RESTART, + oengcommcons.Stages.APACHE_RESTART, ), ) def _closeup(self): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py index c006794..c01d1d2 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,20 +22,14 @@ from otopi import util -from . import misc -from . import root -from . import ssl -from . import selinux +from . import core from . import engine @util.export def createPlugins(context): - misc.Plugin(context=context) - root.Plugin(context=context) - ssl.Plugin(context=context) + core.Plugin(context=context) engine.Plugin(context=context) - selinux.Plugin(context=context) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/core.py similarity index 64% copy from packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py copy to packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/core.py index 5e0b950..b1de037 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/core.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ # -"""Apache misc plugin.""" +"""Apache enable plugin.""" import gettext @@ -27,12 +27,12 @@ from otopi import plugin -from ovirt_engine_setup.engine import constants as oenginecons +from ovirt_engine_setup.engine_common import constants as oengcommcons @util.export class Plugin(plugin.PluginBase): - """Apache misc plugin.""" + """Apache enable plugin.""" def __init__(self, context): super(Plugin, self).__init__(context=context) @@ -41,18 +41,7 @@ stage=plugin.Stages.STAGE_INIT, ) def _init(self): - self.environment.setdefault( - oenginecons.ApacheEnv.CONFIGURED, - False - ) - - @plugin.event( - stage=plugin.Stages.STAGE_MISC, - condition=lambda self: self.environment[oenginecons.CoreEnv.ENABLE], - priority=plugin.Stages.PRIORITY_LOW, - ) - def _misc(self): - self.environment[oenginecons.ApacheEnv.CONFIGURED] = True + self.environment[oengcommcons.ApacheEnv.ENABLE] = True # vim: expandtab tabstop=4 shiftwidth=4 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 c85d71f..44cb813 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 @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -41,8 +41,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine import vdcoption from ovirt_engine_setup import util as osetuputil @@ -289,7 +288,7 @@ uninstall_files.extend( ( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT, + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CERT, oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_STORE, oenginecons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_CERT, oenginecons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_KEY, @@ -356,24 +355,24 @@ self.environment[oenginecons.PKIEnv.STORE_PASS], ), '--key=%s' % ( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY, + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY, ), ), logStreams=False, ) uninstall_files.append( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY ) if not os.path.exists( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT ): os.symlink( oenginecons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_CERT, - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT ) uninstall_files.append( - oenginecons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT + oengcommcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_CA_CERT ) for f in ( -- To view, visit http://gerrit.ovirt.org/29120 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d44ce21a3fc305c874bf83e9638f8340fdeaa2f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
