Yedidyah Bar David has uploaded a new change for review.

Change subject: packaging: setup: always copy vdsm certs if needed
......................................................................

packaging: setup: always copy vdsm certs if needed

In 3.5, 'vdsm-tool configure --force' didn't create vdsm certs, so after
calling it, we checked if the certs exist, and if not, created/copied
various certs.

Now it does. So we do not create the various other certs,
including /etc/pki/CA/cacert.pem .

This change removes the condition 'are vdsm certs created?'.

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


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

diff --git a/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py 
b/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
index 6057f12..4308540 100644
--- a/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
+++ b/src/plugins/ovirt-hosted-engine-setup/pki/vdsmpki.py
@@ -71,7 +71,7 @@
         )
 
     def _safecopy(self, s, d):
-        self.logger.debug("%s %s" % (s, d))
+        self.logger.debug("_safecopy %s %s" % (s, d))
         suffix = datetime.datetime.now().strftime('%Y%m%d%H%M%S'),
         if os.path.exists(d):
             os.rename(d, "%s.%s" % (d, suffix))
@@ -274,7 +274,7 @@
             self._selinux_enabled = (rc == 0)
         if not os.path.exists(ohostedcons.FileLocations.VDSMCERT):
             self._generateVDSMcerts()
-            self._copy_vdsm_pki()
+        self._copy_vdsm_pki()
         if not os.path.exists(
             ohostedcons.FileLocations.LIBVIRT_SPICE_SERVER_CERT
         ):


-- 
To view, visit https://gerrit.ovirt.org/40613
To unsubscribe, visit https://gerrit.ovirt.org/settings

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

Reply via email to