From 0d502ae724804ac41a971abc188dd2967c6645c4 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 22 Oct 2018 09:29:11 -0700 Subject: [PATCH] Switch zuul scheduler to new zk cluster Switch the zuul scheduler to use our new zk cluster. Note this should happen after the builders have switched and populated image data on the new database cluster and at the same time as the launchers update. This gets us off the old single node zk server running on trusty to newer xenial based zk cluster with HA. This change does update the config for mergers and executors for consistency, but I believe that only the scheduler makes use of this config today. Change-Id: I132c176af188787cec3a5a562ffdc81f818c26b0 Depends-On: https://review.openstack.org/612441 --- manifests/site.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 1457e6d648..53b216fb05 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -942,7 +942,7 @@ node /^ze\d+\.openstack\.org$/ { worker_private_key_file => '/var/lib/zuul/ssh/nodepool_id_rsa', revision => $revision, python_version => 3, - zookeeper_hosts => 'nodepool.openstack.org:2181', + zookeeper_hosts => 'zk01.openstack.org:2181,zk02.openstack.org:2181,zk03.openstack.org:2181', zuulv3 => true, connections => hiera('zuul_connections', []), gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'), @@ -1018,7 +1018,7 @@ node /^zuul\d+\.openstack\.org$/ { git_name => $git_name, revision => $revision, python_version => 3, - zookeeper_hosts => 'nodepool.openstack.org:2181', + zookeeper_hosts => 'zk01.openstack.org:2181,zk02.openstack.org:2181,zk03.openstack.org:2181', zookeeper_session_timeout => 40, zuulv3 => true, connections => hiera('zuul_connections', []), @@ -1103,7 +1103,7 @@ node /^zm\d+.openstack\.org$/ { git_name => $git_name, revision => $revision, python_version => 3, - zookeeper_hosts => 'nodepool.openstack.org:2181', + zookeeper_hosts => 'zk01.openstack.org:2181,zk02.openstack.org:2181,zk03.openstack.org:2181', zuulv3 => true, connections => hiera('zuul_connections', []), gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'),