From ccef05dede36d3645939199f79f8e7e198f03abe Mon Sep 17 00:00:00 2001 From: Evgeny Antyshev Date: Thu, 10 Dec 2015 15:05:33 +0000 Subject: [PATCH] Connection names for legacy configs It has been set like that: connections = {'_legacy_gerrit': Connection(name='gerrit')} This leads to that in merger.py it creates ".ssh_wrapper_gerrit" file, basing it on key from connections dict, but tries to use ".ssh_wrapper__legacy_gerrit", basing on connection name. I propose to set it to "gerrit" everywhere (and the same for smtp). Change-Id: I2c2d8bee7bcf98c5f12809f77b34e206d07b8438 --- zuul/lib/connections.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zuul/lib/connections.py b/zuul/lib/connections.py index cb26ba509c..92ddb0fd25 100644 --- a/zuul/lib/connections.py +++ b/zuul/lib/connections.py @@ -56,11 +56,11 @@ def configure_connections(config): if 'gerrit' in config.sections(): connections['gerrit'] = \ zuul.connection.gerrit.GerritConnection( - '_legacy_gerrit', dict(config.items('gerrit'))) + 'gerrit', dict(config.items('gerrit'))) if 'smtp' in config.sections(): connections['smtp'] = \ zuul.connection.smtp.SMTPConnection( - '_legacy_smtp', dict(config.items('smtp'))) + 'smtp', dict(config.items('smtp'))) return connections