opendev
/
system-config
Code Issues Proposed changes

Revert "Add opendaylight connection to zuul" 

This reverts commit c7bb14bba6.

SSH connectivity isn't quite working yet. Revert until we can get that
sorted out.

Change-Id: If2a88a61ed592f927980c71486ed0b7e3cb848d0
This commit is contained in:
Clark Boylan 2018-06-07 08:46:53 -07:00
parent a8a319b4b3
commit 8304b9626c
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hiera/group/zuul-scheduler.yaml
View File

@ -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'

2
manifests/site.pp
View File

@ -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}",
}
}

2
modules/openstack_project/manifests/zuul_merger.pp
View File

@ -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,