diff options
| author | Zuul <zuul@review.opendev.org> | 2022-06-28 16:08:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-06-28 16:08:45 +0000 |
| commit | 6b167dd2f17d49dafec1a9756b04494ea77eea7d (patch) | |
| tree | e5ce612ce668efa0932c9ffbfce9a0dc97f0c8ce /zuul/driver/gerrit | |
| parent | bb0af6dec1b33a41b4a2be0adec016a9451cf7bd (diff) | |
| parent | 595fb3e9eff9103a3cd1cd3286908a5e4dd982ef (diff) | |
| download | zuul-6b167dd2f17d49dafec1a9756b04494ea77eea7d.tar.gz | |
Merge "Add ssh_server option to Gerrit driver"
Diffstat (limited to 'zuul/driver/gerrit')
| -rw-r--r-- | zuul/driver/gerrit/gerritconnection.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/zuul/driver/gerrit/gerritconnection.py b/zuul/driver/gerrit/gerritconnection.py index 005f62b9a..e3adfefb5 100644 --- a/zuul/driver/gerrit/gerritconnection.py +++ b/zuul/driver/gerrit/gerritconnection.py @@ -578,6 +578,7 @@ class GerritConnection(ZKChangeCacheMixin, ZKBranchCacheMixin, BaseConnection): self.user = self.connection_config.get('user') self.server = self.connection_config.get('server') + self.ssh_server = self.connection_config.get('ssh_server', self.server) self.canonical_hostname = self.connection_config.get( 'canonical_hostname', self.server) self.port = int(self.connection_config.get('port', 29418)) @@ -680,6 +681,7 @@ class GerritConnection(ZKChangeCacheMixin, ZKBranchCacheMixin, BaseConnection): "baseurl": self.baseurl, "canonical_hostname": self.canonical_hostname, "server": self.server, + "ssh_server": self.ssh_server, "port": self.port, }) return d @@ -1535,7 +1537,7 @@ class GerritConnection(ZKChangeCacheMixin, ZKBranchCacheMixin, BaseConnection): client.set_missing_host_key_policy(paramiko.WarningPolicy()) # SSH banner, handshake, and auth timeouts default to 15 # seconds, so we only set the socket timeout here. - client.connect(self.server, + client.connect(self.ssh_server, username=self.user, port=self.port, key_filename=self.keyfile, @@ -1626,7 +1628,7 @@ class GerritConnection(ZKChangeCacheMixin, ZKBranchCacheMixin, BaseConnection): baseurl = urllib.parse.urlunparse(baseurl) url = ('%s/a/%s' % (baseurl, project.name)) else: - url = 'ssh://%s@%s:%s/%s' % (self.user, self.server, self.port, + url = 'ssh://%s@%s:%s/%s' % (self.user, self.ssh_server, self.port, project.name) return url @@ -1717,7 +1719,7 @@ class GerritConnection(ZKChangeCacheMixin, ZKBranchCacheMixin, BaseConnection): self.watcher_thread = GerritWatcher( self, self.user, - self.server, + self.ssh_server, self.port, keyfile=self.keyfile, keepalive=self.keepalive) |