From 83a422e180d725a71d5db0341dce4a8d2c79a6b2 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 23 Jan 2020 15:18:58 -0800
Subject: [PATCH] Set gerrit digest auth in zuul config
Zuul is updating the default auth type for gerrit connections to better
reflect current Gerrit's expectations. We need to force digest instead
of basic auth in order to accomodate our older gerrit install.
Change-Id: I6ec64f0625abe0c9e3871a5d1942a35e1a58177c
---
hiera/group/zuul-executor.yaml | 1 +
hiera/group/zuul-merger.yaml | 1 +
hiera/group/zuul-scheduler.yaml | 1 +
3 files changed, 3 insertions(+)
diff --git a/hiera/group/zuul-executor.yaml b/hiera/group/zuul-executor.yaml
index 7745e9c536..be6155d91f 100644
--- a/hiera/group/zuul-executor.yaml
+++ b/hiera/group/zuul-executor.yaml
@@ -6,6 +6,7 @@ zuul_connections:
canonical_hostname: 'opendev.org'
user: 'zuul'
sshkey: '/var/lib/zuul/ssh/id_rsa'
+ auth_type: 'digest'
- name: 'github'
driver: 'github'
diff --git a/hiera/group/zuul-merger.yaml b/hiera/group/zuul-merger.yaml
index bc37db65f6..3cdd908fee 100644
--- a/hiera/group/zuul-merger.yaml
+++ b/hiera/group/zuul-merger.yaml
@@ -36,6 +36,7 @@ zuul_connections:
canonical_hostname: 'opendev.org'
user: 'zuul'
sshkey: '/var/lib/zuul/ssh/id_rsa'
+ auth_type: 'digest'
- name: 'github'
driver: 'github'
diff --git a/hiera/group/zuul-scheduler.yaml b/hiera/group/zuul-scheduler.yaml
index effe5fe813..768b9bad43 100644
--- a/hiera/group/zuul-scheduler.yaml
+++ b/hiera/group/zuul-scheduler.yaml
@@ -14,6 +14,7 @@ zuul_connections:
user: 'zuul'
sshkey: '/var/lib/zuul/ssh/id_rsa'
gitweb_url_template: 'https://opendev.org/{project.name}/commit/{sha}'
+ auth_type: 'digest'
- name: 'opendaylight'
driver: 'gerrit'