Alon Bar-Lev has uploaded a new change for review. Change subject: vdsm: pki: fix permission of spice directory ......................................................................
vdsm: pki: fix permission of spice directory old vdsm-bootstrap implementations touched spice pki directory explicitly, so we need to revert to something sane. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1008328 Change-Id: Ib47feea4d9beace8acc38cfc0e4cd18a46c22654 Signed-off-by: Alon Bar-Lev <[email protected]> --- M ChangeLog M src/plugins/ovirt-host-deploy/vdsm/pki.py 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy refs/changes/16/19316/1 diff --git a/ChangeLog b/ChangeLog index 9e00f60..45e295c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ * vdsm: packages: stop libvirtd before using vdsm-tool to configure it. rhbz#999853. + * vdsm: pki: revert spice pki dir permissions and mode to revert legacy + vdsm-bootstrap doings. rhbz#1008328. 2013-08-26 - Version 1.1.0 diff --git a/src/plugins/ovirt-host-deploy/vdsm/pki.py b/src/plugins/ovirt-host-deploy/vdsm/pki.py index bd1a412..f374a99 100644 --- a/src/plugins/ovirt-host-deploy/vdsm/pki.py +++ b/src/plugins/ovirt-host-deploy/vdsm/pki.py @@ -22,6 +22,8 @@ import os +import pwd +import grp import configparser import gettext _ = lambda m: gettext.dgettext(message=m, domain='ovirt-host-deploy') @@ -225,6 +227,24 @@ except: pass + # + # LEGACY-BEGIN + # old vdsm-bootstrap implementations touched + # spice pki directory explicitly, so we need to revert + # to something sane. + # rhbz#1008328 + # + dir = os.path.dirname( + os.path.join( + vdsmTrustStore, + odeploycons.FileLocations.VDSM_SPICE_CA_FILE, + ) + ) + if os.path.exists(dir): + os.chmod(dir, 0o755) + os.chown(dir, pwd.getpwnam('vdsm')[2], grp.getgrnam('kvm')[2]) + # LEGACY-END + useM2Crypto = self._isM2Crypto() enrollment = self.environment[ odeploycons.VdsmEnv.CERTIFICATE_ENROLLMENT -- To view, visit http://gerrit.ovirt.org/19316 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib47feea4d9beace8acc38cfc0e4cd18a46c22654 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-host-deploy Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
