Irit Goihman has uploaded a new change for review.
Change subject: certificates: remove config.read call ......................................................................
certificates: remove config.read call
certificates initiated config read from 'vdsm.conf' file, while config should be built from a few configuration files. This call overrides vdsm configuration and should be removed.
Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1368115 Signed-off-by: Irit Goihman igoihman@redhat.com --- M lib/vdsm/tool/configurators/certificates.py 1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/62885/1
diff --git a/lib/vdsm/tool/configurators/certificates.py b/lib/vdsm/tool/configurators/certificates.py index bdb686a..0462b4d 100644 --- a/lib/vdsm/tool/configurators/certificates.py +++ b/lib/vdsm/tool/configurators/certificates.py @@ -68,11 +68,5 @@
def _certsExist(): - config.read( - os.path.join( - SYSCONF_PATH, - 'vdsm/vdsm.conf' - ) - ) return not config.getboolean('vars', 'ssl') or\ os.path.isfile(CERT_FILE)
gerrit-hooks has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 1:
* #1368115::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1368115::OK, public bug * Check Product::#1368115::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
Irit Goihman has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 1: Verified+1
gerrit-hooks has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 2:
* #1368115::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1368115::OK, public bug * Check Product::#1368115::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
Yaniv Bronhaim has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 2: Code-Review+1
Dan Kenigsberg has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 2:
(1 comment)
https://gerrit.ovirt.org/#/c/62885/2//COMMIT_MSG Commit Message:
Line 6: Line 7: certificates: remove config.read call Line 8: Line 9: certificates initiated config read from 'vdsm.conf' file, while config Line 10: should be loaded from multiple configuration files starting from sorry, but I fail to parse the English of this commit message. Why is it safe to remove the code? Line 11: https://gerrit.ovirt.org/#/c/58728/ Line 12: config.read call overrides vdsm configuration and should be removed. Line 13: Line 14: Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514
gerrit-hooks has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 3:
* #1368115::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1368115::OK, public bug * Check Product::#1368115::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
Dan Kenigsberg has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 3: Code-Review+2
gerrit-hooks has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 4:
* #1368115::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1368115::OK, public bug * Check Product::#1368115::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
Dan Kenigsberg has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 4: Code-Review+2
Dan Kenigsberg has submitted this change and it was merged.
Change subject: certificates: remove config.read call ......................................................................
certificates: remove config.read call
config.read(file) loads a new configuration to 'config' based on the file it reads. This call causes a bug and incosistency of vdsm configuration since it overrides the right configuration. config should be built from files in pre configured paths (drop-in dirs) with priority determined by configuration file names.
Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1368115 Signed-off-by: Irit Goihman igoihman@redhat.com Reviewed-on: https://gerrit.ovirt.org/62885 Continuous-Integration: Jenkins CI Reviewed-by: Yaniv Bronhaim ybronhei@redhat.com Reviewed-by: Dan Kenigsberg danken@redhat.com --- M lib/vdsm/tool/configurators/certificates.py 1 file changed, 0 insertions(+), 6 deletions(-)
Approvals: Yaniv Bronhaim: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Irit Goihman: Verified Dan Kenigsberg: Looks good to me, approved
gerrit-hooks has posted comments on this change.
Change subject: certificates: remove config.read call ......................................................................
Patch Set 5:
* #1368115::Update tracker: OK * Set MODIFIED::bug 1368115::::#1368115::IGNORE, skipping for branch 'master'
vdsm-patches@lists.fedorahosted.org