From 8304b9626c3f92d7a4e7ec02369d6a6d332e6391 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 7 Jun 2018 08:46:53 -0700 Subject: [PATCH] Revert "Add opendaylight connection to zuul" This reverts commit c7bb14bba6ec00fff61879154a3f5f143c98767b. SSH connectivity isn't quite working yet. Revert until we can get that sorted out. Change-Id: If2a88a61ed592f927980c71486ed0b7e3cb848d0 --- hiera/group/zuul-scheduler.yaml | 7 ------- manifests/site.pp | 2 +- modules/openstack_project/manifests/zuul_merger.pp | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/hiera/group/zuul-scheduler.yaml b/hiera/group/zuul-scheduler.yaml index d2de32c366..c18bfe4e97 100644 --- a/hiera/group/zuul-scheduler.yaml +++ b/hiera/group/zuul-scheduler.yaml @@ -15,13 +15,6 @@ zuul_connections: sshkey: '/var/lib/zuul/ssh/id_rsa' gitweb_url_template: 'https://git.openstack.org/cgit/{project.name}/commit/?id={sha}' - - name: 'opendaylight' - driver: 'gerrit' - server: 'git.opendaylight.org' - baseurl: 'git.opendaylight.org/gerrit' - user: 'openstack-zuul' - sshkey: '/var/lib/zuul/ssh/id_rsa' - - name: 'mysql' driver: 'sql' diff --git a/manifests/site.pp b/manifests/site.pp index 16f402ec66..d71b9adf29 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1285,7 +1285,7 @@ node /^ze\d+\.openstack\.org$/ { } class { '::zuul::known_hosts': - known_hosts_content => "review.openstack.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ${gerrit_ssh_host_key}\ngit.opendaylight.org,52.35.122.251,2600:1f14:421:f500:7b21:2a58:ab0a:2d17 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJbPbJvIQZ4BzdfV13OUj+R4pGwX7tLv7DG8LzzEw3XSAUmHx50E4ObKrpTMEAUZ3Gt6QrrnVr1VXrs+134m7IY=", + known_hosts_content => "review.openstack.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ${gerrit_ssh_host_key}", } } diff --git a/modules/openstack_project/manifests/zuul_merger.pp b/modules/openstack_project/manifests/zuul_merger.pp index 9073a2d95e..ec8333dc90 100644 --- a/modules/openstack_project/manifests/zuul_merger.pp +++ b/modules/openstack_project/manifests/zuul_merger.pp @@ -18,7 +18,7 @@ class openstack_project::zuul_merger( gearman_server => $gearman_server, gerrit_server => $gerrit_server, gerrit_user => $gerrit_user, - known_hosts_content => "review.openstack.org,23.253.232.87,2001:4800:7815:104:3bc3:d7f6:ff03:bf5d ${gerrit_ssh_host_key}\ngit.opendaylight.org,52.35.122.251,2600:1f14:421:f500:7b21:2a58:ab0a:2d17 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJbPbJvIQZ4BzdfV13OUj+R4pGwX7tLv7DG8LzzEw3XSAUmHx50E4ObKrpTMEAUZ3Gt6QrrnVr1VXrs+134m7IY=", + known_hosts_content => "review.openstack.org,23.253.232.87,2001:4800:7815:104:3bc3:d7f6:ff03:bf5d ${gerrit_ssh_host_key}", zuul_ssh_private_key => $zuul_ssh_private_key, zuul_url => $zuul_url, git_email => $git_email,