Alon Bar-Lev has uploaded a new change for review. Change subject: pki: fix engine-upgrade config creation ......................................................................
pki: fix engine-upgrade config creation Change-Id: I9af1bbb2be895f4d77d9a060454b72109bb5a382 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/fedora/setup/engine-upgrade.py 1 file changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/14566/1 diff --git a/packaging/fedora/setup/engine-upgrade.py b/packaging/fedora/setup/engine-upgrade.py index 1144683..e9d4816 100755 --- a/packaging/fedora/setup/engine-upgrade.py +++ b/packaging/fedora/setup/engine-upgrade.py @@ -550,12 +550,19 @@ handler.editParam("SSLCertificateChainFile", basedefs.FILE_APACHE_CA_CRT_SRC) handler.close() - utils.updateVDCOption("keystoreUrl", basedefs.FILE_ENGINE_KEYSTORE, (), "text") - utils.updateVDCOption("TruststoreUrl", basedefs.FILE_TRUSTSTORE, (), "text") - utils.updateVDCOption("CertAlias", "1", (), "text") - def commit(self): shutil.move(self.TMPAPACHECONF, basedefs.FILE_HTTPD_SSL_CONFIG) + + utils.editEngineSysconfigPKI( + pkidir=basedefs.DIR_OVIRT_PKI, + caCerticate=basedefs.FILE_CA_CRT_SRC, + enigneStore=basedefs.FILE_ENGINE_KEYSTORE, + engineStorePassword=basedefs.CONST_KEY_PASS, + engineStoreAlias="1", + engineCerticate=basedefs.FILE_ENGINE_CERT, + trustStore=basedefs.FILE_TRUSTSTORE, + trustStorePassword=basedefs.CONST_KEY_PASS, + ) if os.path.exists(self.JKSKEYSTORE): logging.debug("PKI: removing JKS keystore") @@ -1210,7 +1217,7 @@ startEngineService = [startEngine] preupgradeFunc = [preupgradeUUIDCheck] upgradeFunc = [rhyum.update, generateEngineConf, setupVarPrivileges, - updateHttpdConf, utils.editEngineSysconfigPKI, + updateHttpdConf, ] postFunc = [modifyUUIDs, ca.commit, runPost, deleteEngineSysconfig] engineService = basedefs.ENGINE_SERVICE_NAME -- To view, visit http://gerrit.ovirt.org/14566 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9af1bbb2be895f4d77d9a060454b72109bb5a382 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
