Yedidyah Bar David has uploaded a new change for review.
Change subject: packaging: setup: allow uninstall ca,cert.conf
......................................................................
packaging: setup: allow uninstall ca,cert.conf
engine-setup did not add cacert.conf and cert.conf to the
uninstall file. This caused them to not be deleted on engine-cleanup.
Change-Id: I8c5c4f956bdd824268eb478fabeb5c77392acbb7
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/constants.py
M packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py
M packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
3 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/17384/1
diff --git a/packaging/setup/ovirt_engine_setup/constants.py
b/packaging/setup/ovirt_engine_setup/constants.py
index 993f379..89142e4 100644
--- a/packaging/setup/ovirt_engine_setup/constants.py
+++ b/packaging/setup/ovirt_engine_setup/constants.py
@@ -259,6 +259,14 @@
OVIRT_ENGINE_PKIDIR,
'cert.template.in',
)
+ OVIRT_ENGINE_PKI_CA_CERT_CONF = os.path.join(
+ OVIRT_ENGINE_PKIPRIVATEDIR,
+ 'cacert.conf',
+ )
+ OVIRT_ENGINE_PKI_CERT_CONF = os.path.join(
+ OVIRT_ENGINE_PKIDIR,
+ 'cert.conf',
+ )
OVIRT_ENGINE_PKI_ENGINE_CA_KEY = os.path.join(
OVIRT_ENGINE_PKIPRIVATEDIR,
'ca.pem',
diff --git a/packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py
b/packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py
index 57d7620..ba4cc05 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/legacy/ca.py
@@ -59,6 +59,8 @@
osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_STORE,
osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_TRUST_STORE,
osetupcons.FileLocations.OVIRT_ENGINE_PKI_JBOSS_STORE,
+ osetupcons.FileLocations.OVIRT_ENGINE_PKI_CA_CERT_CONF,
+ osetupcons.FileLocations.OVIRT_ENGINE_PKI_CERT_CONF,
):
if os.path.exists(name):
uninstall_files.append(name)
diff --git a/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
b/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
index 8b17404..729bb79 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
@@ -243,6 +243,8 @@
osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_STORE,
osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_TRUST_STORE,
osetupcons.FileLocations.OVIRT_ENGINE_PKI_JBOSS_STORE,
+ osetupcons.FileLocations.OVIRT_ENGINE_PKI_CA_CERT_CONF,
+ osetupcons.FileLocations.OVIRT_ENGINE_PKI_CERT_CONF,
)
)
--
To view, visit http://gerrit.ovirt.org/17384
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c5c4f956bdd824268eb478fabeb5c77392acbb7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
