Simone Tiraboschi has uploaded a new change for review.
Change subject: packaging: setup: fixing remote engine pki common code usage on
upgrades
......................................................................
packaging: setup: fixing remote engine pki common code usage on upgrades
Change-Id: I011db10e16bb931c1610bc6645410917e722218d
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py
2 files changed, 43 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/86/33786/1
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py
index e520b7f..700297e 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py
@@ -105,9 +105,9 @@
base_name=oreportscons.Const.PKI_REPORTS_APACHE_CERT_NAME,
base_touser=_('Apache'),
key_file=oreportscons.FileLocations.
- OVIRT_ENGINE_PKI_REPORTS_APACHE_KEY,
+ OVIRT_ENGINE_PKI_REPORTS_APACHE_KEY,
cert_file=oreportscons.FileLocations.
- OVIRT_ENGINE_PKI_REPORTS_APACHE_CERT,
+ OVIRT_ENGINE_PKI_REPORTS_APACHE_CERT,
csr_fname_envkey=(
oreportscons.ConfigEnv.PKI_APACHE_CSR_FILENAME
),
@@ -116,9 +116,9 @@
'ca.pem'
),
engine_pki_requests_dir=oreportscons.FileLocations.
- OVIRT_ENGINE_PKIREQUESTSDIR,
+ OVIRT_ENGINE_PKIREQUESTSDIR,
engine_pki_certs_dir=oreportscons.FileLocations.
- OVIRT_ENGINE_PKICERTSDIR,
+ OVIRT_ENGINE_PKICERTSDIR,
key_size=self.environment[oreportscons.ConfigEnv.KEY_SIZE],
url="http://www.ovirt.org/Features/Separate-Reports-Host";,
)
@@ -128,6 +128,8 @@
oreportscons.FileLocations.
OVIRT_ENGINE_PKI_REPORTS_APACHE_CA_CERT
)
+ else:
+ self._enabled = False
tries_left = 30
while (
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py
index 7d54c75..7adc70e 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py
@@ -76,30 +76,44 @@
)
def _customization(self):
self._enabled = True
- self._enrolldata = remote_engine.EnrollCert(
- remote_engine=self.environment[osetupcons.CoreEnv.REMOTE_ENGINE],
- engine_fqdn=self.environment[
- oreportscons.EngineConfigEnv.ENGINE_FQDN
- ],
- base_name=oreportscons.Const.PKI_REPORTS_JBOSS_CERT_NAME,
- base_touser=_('Reports'),
- key_file=oreportscons.FileLocations.
- OVIRT_ENGINE_PKI_REPORTS_JBOSS_KEY,
- cert_file=oreportscons.FileLocations.
- OVIRT_ENGINE_PKI_REPORTS_JBOSS_CERT,
- csr_fname_envkey=oreportscons.ConfigEnv.PKI_JBOSS_CSR_FILENAME,
- engine_ca_cert_file=os.path.join(
- oreportscons.FileLocations.OVIRT_ENGINE_PKIDIR,
- 'ca.pem'
- ),
- engine_pki_requests_dir=oreportscons.FileLocations.
- OVIRT_ENGINE_PKIREQUESTSDIR,
- engine_pki_certs_dir=oreportscons.FileLocations.
- OVIRT_ENGINE_PKICERTSDIR,
- key_size=self.environment[oreportscons.ConfigEnv.KEY_SIZE],
- url="http://www.ovirt.org/Features/Separate-Reports-Host";,
+
+ reports_jboss_pki_found = (
+ os.path.exists(
+ oreportscons.FileLocations.OVIRT_ENGINE_PKI_REPORTS_JBOSS_KEY
+ ) and os.path.exists(
+ oreportscons.FileLocations.OVIRT_ENGINE_PKI_REPORTS_JBOSS_CERT
+ )
)
- self._enrolldata.enroll_cert()
+
+ if not reports_jboss_pki_found:
+ self._enrolldata = remote_engine.EnrollCert(
+ remote_engine=self.environment[
+ osetupcons.CoreEnv.REMOTE_ENGINE
+ ],
+ engine_fqdn=self.environment[
+ oreportscons.EngineConfigEnv.ENGINE_FQDN
+ ],
+ base_name=oreportscons.Const.PKI_REPORTS_JBOSS_CERT_NAME,
+ base_touser=_('Reports'),
+ key_file=oreportscons.FileLocations.
+ OVIRT_ENGINE_PKI_REPORTS_JBOSS_KEY,
+ cert_file=oreportscons.FileLocations.
+ OVIRT_ENGINE_PKI_REPORTS_JBOSS_CERT,
+ csr_fname_envkey=oreportscons.ConfigEnv.PKI_JBOSS_CSR_FILENAME,
+ engine_ca_cert_file=os.path.join(
+ oreportscons.FileLocations.OVIRT_ENGINE_PKIDIR,
+ 'ca.pem'
+ ),
+ engine_pki_requests_dir=oreportscons.FileLocations.
+ OVIRT_ENGINE_PKIREQUESTSDIR,
+ engine_pki_certs_dir=oreportscons.FileLocations.
+ OVIRT_ENGINE_PKICERTSDIR,
+ key_size=self.environment[oreportscons.ConfigEnv.KEY_SIZE],
+ url="http://www.ovirt.org/Features/Separate-Reports-Host";,
+ )
+ self._enrolldata.enroll_cert()
+ else:
+ self._enabled = False
@plugin.event(
stage=plugin.Stages.STAGE_MISC,
--
To view, visit http://gerrit.ovirt.org/33786
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I011db10e16bb931c1610bc6645410917e722218d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
