Alon Bar-Lev has posted comments on this change. Change subject: Split of engine-setup-plugin ......................................................................
Patch Set 36: (14 comments) http://gerrit.ovirt.org/#/c/27647/36/ovirt-engine.spec.in File ovirt-engine.spec.in: Line 947: %ghost %config(noreplace) %{_sysconfdir}/firewalld/services/ovirt.xml Line 948: Line 949: %files setup-plugin-ovirt-engine-common Line 950: Line 951: %{engine_data}/setup/dbutils/ the following are engine specific: fkvalidator.sh fkvalidator_sp.sql taskcleaner.sh taskcleaner_sp.sql Line 952: %{engine_data}/setup/ovirt_engine_setup/engine_common/ Line 953: %{engine_data}/setup/plugins/*/ovirt-engine-common/ Line 954: Line 955: %files setup-plugin-websocket-proxy http://gerrit.ovirt.org/#/c/27647/36/packaging/setup/ovirt_engine_setup/engine/engineconstants.py File packaging/setup/ovirt_engine_setup/engine/engineconstants.py: Line 26: Line 27: from otopi import util Line 28: Line 29: Line 30: from . import engineconfig import of . should go last and within own block Line 31: from ovirt_engine_setup import constants as osetupcons Line 32: from ovirt_engine_setup.constants import osetupattrsclass Line 33: from ovirt_engine_setup.constants import osetupattrs Line 34: http://gerrit.ovirt.org/#/c/27647/36/packaging/setup/ovirt_engine_setup/engine_common/enginecommonconstants.py File packaging/setup/ovirt_engine_setup/engine_common/enginecommonconstants.py: Line 51: HTTPD_CONF_OVIRT_ENGINE = os.path.join( Line 52: DIR_HTTPD, Line 53: 'conf.d', Line 54: 'z-ovirt-engine-proxy.conf', Line 55: ) this is ovirt-engine specific Line 56: HTTPD_CONF_OVIRT_ROOT = os.path.join( Line 57: DIR_HTTPD, Line 58: 'conf.d', Line 59: 'ovirt-engine-root-redirect.conf', Line 56: HTTPD_CONF_OVIRT_ROOT = os.path.join( Line 57: DIR_HTTPD, Line 58: 'conf.d', Line 59: 'ovirt-engine-root-redirect.conf', Line 60: ) this is ovirt-engine specific Line 61: HTTPD_CONF_SSL = os.path.join( Line 62: DIR_HTTPD, Line 63: 'conf.d', Line 64: 'ssl.conf', Line 66: HTTPD_CONF_OVIRT_ENGINE_TEMPLATE = os.path.join( Line 67: osetupcons.FileLocations.OVIRT_SETUP_DATADIR, Line 68: 'conf', Line 69: 'ovirt-engine-proxy.conf.v2.in', Line 70: ) this is ovirt-engine specific Line 71: HTTPD_CONF_OVIRT_ROOT_TEMPLATE = os.path.join( Line 72: osetupcons.FileLocations.OVIRT_SETUP_DATADIR, Line 73: 'conf', Line 74: 'ovirt-engine-root-redirect.conf.in', Line 71: HTTPD_CONF_OVIRT_ROOT_TEMPLATE = os.path.join( Line 72: osetupcons.FileLocations.OVIRT_SETUP_DATADIR, Line 73: 'conf', Line 74: 'ovirt-engine-root-redirect.conf.in', Line 75: ) this is ovirt-engine specific Line 76: Line 77: OVIRT_ENGINE_DB_UTILS_DIR = os.path.join( Line 78: OVIRT_ENGINE_COMMON_DATADIR, Line 79: 'setup', Line 86: ) Line 87: OVIRT_ENGINE_TASKCLEANER = os.path.join( Line 88: OVIRT_ENGINE_DB_UTILS_DIR, Line 89: 'taskcleaner.sh' Line 90: ) this is engine specific Line 91: OVIRT_ENGINE_DB_CHANGE_OWNER = os.path.join( Line 92: OVIRT_ENGINE_DB_UTILS_DIR, Line 93: 'changedbowner.sh' Line 94: ) Line 90: ) Line 91: OVIRT_ENGINE_DB_CHANGE_OWNER = os.path.join( Line 92: OVIRT_ENGINE_DB_UTILS_DIR, Line 93: 'changedbowner.sh' Line 94: ) this we won't need in 3.5, just a utility but we passed the issues of legacy setup I hope. Line 95: Line 96: Line 97: @util.export Line 98: class Defaults(object): Line 330: Line 331: @util.export Line 332: @util.codegen Line 333: @osetupattrsclass Line 334: class ApacheEnv(object): we will need to modify this plugin behaviour, as the reports will also require to configure apace, so several of these are engine specific. you can do this in future patch, but note this. Line 335: Line 336: HTTPD_SERVICE = 'OVESETUP_APACHE/httpdService' Line 337: Line 338: HTTPD_CONF_SSL = 'OVESETUP_APACHE/configFileSsl' Line 335: Line 336: HTTPD_SERVICE = 'OVESETUP_APACHE/httpdService' Line 337: Line 338: HTTPD_CONF_SSL = 'OVESETUP_APACHE/configFileSsl' Line 339: HTTPD_CONF_OVIRT_ENGINE = 'OVESETUP_APACHE/configFileOvirtEngine' we need a config per engine and per reports Line 340: HTTPD_CONF_OVIRT_ROOT = 'OVESETUP_APACHE/configFileOvirtRoot' Line 341: Line 342: CONFIGURE_ROOT_REDIRECTIOND_DEFAULT = \ Line 343: 'OVESETUP_APACHE/configureRootRedirectionDefault' Line 347: @osetupattrs( Line 348: postinstallfile=True, Line 349: ) Line 350: def CONFIGURED(self): Line 351: return 'OVESETUP_APACHE/configured' the configured is different between the engine and reports. Line 352: Line 353: @osetupattrs( Line 354: answerfile=True, Line 355: summary=True, http://gerrit.ovirt.org/#/c/27647/36/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py File packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py: Line 192: def _closeup(self): Line 193: self.logger.debug('Connecting to the Engine') Line 194: engine_api = self._waitEngineUp() Line 195: Line 196: vdc = vdcoption.VdcOption( you do not need this vdc temp variable... :) Line 197: statement=self.environment[ Line 198: oengcommcons.EngineDBEnv.STATEMENT Line 199: ] Line 200: ) http://gerrit.ovirt.org/#/c/27647/36/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py File packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py: Line 169: self.logger.info( Line 170: _( Line 171: 'If the engine is deployed on a different host\n' Line 172: 'please execute the following command on that host:\n' Line 173: '\tengine-config -s WebSocketProxy={host}:{port}\n' please do not use tabs in messages Line 174: ).format( Line 175: host=self.environment[ Line 176: oenginecons.ConfigEnv.WEBSOCKET_PROXY_HOST Line 177: ], Line 177: ], Line 178: port=self.environment[ Line 179: oenginecons.ConfigEnv.WEBSOCKET_PROXY_PORT Line 180: ], Line 181: ) please remove this for now, we are not working on splitting websocket proxy yet. Line 182: ) Line 183: Line 184: self.execute( Line 185: args=( -- To view, visit http://gerrit.ovirt.org/27647 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4d465766f10a490bd213ca3510d02b3d6fdfa7c6 Gerrit-PatchSet: 36 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alo...@redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbona...@redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stira...@redhat.com> Gerrit-Reviewer: Yedidyah Bar David <d...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
