Sandro Bonazzola has uploaded a new change for review.

Change subject: pki: fixed subject usage
......................................................................

pki: fixed subject usage

Fixed the env variable to be used while generating the spice
pki certificate.

Change-Id: I3e48c691ca59df430dea64785c6f5ac62531a9ad
Bug-Url: https://bugzilla.redhat.com/1025259
Signed-off-by: Sandro Bonazzola <[email protected]>
---
M src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup 
refs/changes/77/20777/1

diff --git a/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py 
b/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
index aa872f4..8cf5e4c 100644
--- a/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
+++ b/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
@@ -95,7 +95,7 @@
         self.logger.info(_('Generating libvirt-spice certificates'))
         self._tmpdir = tempfile.mkdtemp()
         expire = '1095'  # FIXME: configurable?
-        subj = self.environment[ohostedcons.VDSMEnv.SPICE_SUBJECT]
+        subj = self.environment[ohostedcons.VDSMEnv.PKI_SUBJECT]
         # FIXME: configurable?
         for key in ('ca-key.pem', 'server-key.pem'):
             self.execute(
@@ -175,7 +175,7 @@
         )
         self.environment.setdefault(
             ohostedcons.VDSMEnv.SPICE_SUBJECT,
-            ohostedcons.Defaults.DEFAULT_PKI_SUBJECT
+            None
         )
 
     @plugin.event(
@@ -203,6 +203,7 @@
             self._generateVDSMcerts()
         if not os.path.exists(ohostedcons.FileLocations.LIBVIRT_SERVER_CERT):
             self._generateSPICEcerts()
+        self._getSPICEcerts()
 
     @plugin.event(
         stage=plugin.Stages.STAGE_CLEANUP,


-- 
To view, visit http://gerrit.ovirt.org/20777
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e48c691ca59df430dea64785c6f5ac62531a9ad
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to