Change in vdsm[master]: Validate conf in configure only if not forcing overriding

danken at redhat.com danken at redhat.com
Thu Feb 13 22:58:26 UTC 2014


Dan Kenigsberg has submitted this change and it was merged.

Change subject: Validate conf in configure only if not forcing overriding
......................................................................


Validate conf in configure only if not forcing overriding

When --force flag is sent to configure the conf might be overrided
(depends on reconfigureOnForce return value).
Therefore, checking validate conf before overriding can lead to a fail
while the current configuration is not relevant.

libvirt_configure.sh already manage to set the right configure in
libvirtd.conf and qemu.conf according to the ssl verb in vdsm.conf.
BUT, without this patch we validate the current config
state before overriding the files even though the --force flag was
stated, and this lead to fail the configure.

With that patch, setting in vdsm.conf ssl=True and then running
"vdsm-tool configure --force" will update libvirtd.conf and qemu.conf
according to vdsm.conf state.

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1036883
Change-Id: Ibd9e95c06b1437074f37248e77bb086a3c3bad63
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
Reviewed-on: http://gerrit.ovirt.org/24132
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M lib/vdsm/tool/configurator.py
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Yaniv Bronhaim: Verified
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd9e95c06b1437074f37248e77bb086a3c3bad63
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list