Sandro Bonazzola has uploaded a new change for review.
Change subject: pki: fix spice pki certificate parsing
......................................................................
pki: fix spice pki certificate parsing
fixed spice pki certificate parsing and moved it
to validation stage for having the correct certificate
subject in the answer file.
Change-Id: I0188e3f27008c989f6c0ff7de7fa47215fc32466
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
1 file changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup
refs/changes/17/17817/1
diff --git a/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
b/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
index 65f4d25..aa872f4 100644
--- a/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
+++ b/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
@@ -49,7 +49,7 @@
^
\s+
Subject:\s*
- (?P<subject>(\w+=\w+,\s+)+.*)
+ (?P<subject>\w+=\w+.*)
$
"""
)
@@ -188,6 +188,13 @@
self.command.detect('openssl')
@plugin.event(
+ stage=plugin.Stages.STAGE_VALIDATION,
+ )
+ def _validation(self):
+ if os.path.exists(ohostedcons.FileLocations.LIBVIRT_SERVER_CERT):
+ self._getSPICEcerts()
+
+ @plugin.event(
stage=plugin.Stages.STAGE_MISC,
name=ohostedcons.Stages.VDSMD_PKI,
)
@@ -196,8 +203,6 @@
self._generateVDSMcerts()
if not os.path.exists(ohostedcons.FileLocations.LIBVIRT_SERVER_CERT):
self._generateSPICEcerts()
- else:
- self._getSPICEcerts()
@plugin.event(
stage=plugin.Stages.STAGE_CLEANUP,
--
To view, visit http://gerrit.ovirt.org/17817
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0188e3f27008c989f6c0ff7de7fa47215fc32466
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
