Yedidyah Bar David has uploaded a new change for review.
Change subject: packaging: setup: Disable pki renewal for 3.5
......................................................................
packaging: setup: Disable pki renewal for 3.5
Change-Id: Ib0de9b1f1c3aa3aa1f3d81d47a91d44f458e7192
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/41882/1
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 fdb77ce..57dfb54 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
@@ -296,7 +296,7 @@
self._enrollCertificate(
entry['name'],
uninstall_files,
- keepKey=entry['keepKey'] and renew,
+ keepKey=entry['keepKey'] or renew,
)
os.chown(
pkcs12,
@@ -390,7 +390,9 @@
self.environment[oenginecons.CoreEnv.ENABLE] and
os.path.exists(
oenginecons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_CERT
- )
+ ) and
+ # Disable this in 3.5.z.
+ False
),
before=(
oenginecons.Stages.CA_AVAILABLE,
--
To view, visit https://gerrit.ovirt.org/41882
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0de9b1f1c3aa3aa1f3d81d47a91d44f458e7192
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
