From d9252e7b285aab10578e9bb0bc0344e23dd84f26 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 8 Jun 2020 14:46:45 -0700 Subject: [PATCH] Consolidate zuul_connection variable All zuul.conf files can have the same contents, including the connection information. To reduce the chances of error, set it in only one place. If some entries in zuul_connections_secrets aren't available (because they are specified in a narrower group), we simply won't include them in the zuul.conf file for that group. That should be fine. Change-Id: I446f531162f409e7479eb904251d0c75b9a6e8ff --- .../service/group_vars/zuul-executor.yaml | 19 --------- inventory/service/group_vars/zuul-merger.yaml | 19 --------- .../service/group_vars/zuul-scheduler.yaml | 40 ------------------- inventory/service/group_vars/zuul.yaml | 39 ++++++++++++++++++ 4 files changed, 39 insertions(+), 78 deletions(-) delete mode 100644 inventory/service/group_vars/zuul-merger.yaml diff --git a/inventory/service/group_vars/zuul-executor.yaml b/inventory/service/group_vars/zuul-executor.yaml index b2f2a4877b..bcfb802a3d 100644 --- a/inventory/service/group_vars/zuul-executor.yaml +++ b/inventory/service/group_vars/zuul-executor.yaml @@ -1,25 +1,6 @@ iptables_extra_public_tcp_ports: - 79 - 7900 -zuul_connections: - - name: 'gerrit' - driver: 'gerrit' - server: 'review.opendev.org' - canonical_hostname: 'opendev.org' - user: 'zuul' - sshkey: '/var/lib/zuul/ssh/id_rsa' - auth_type: 'digest' - - - name: 'github' - driver: 'github' - - - name: 'googlesource' - driver: 'gerrit' - server: 'gerrit-review.googlesource.com' - canonical_hostname: 'gerrit.googlesource.com' - user: 'git-infra-root.openstack.org' - stream_events: 'false' - auth_type: 'basic' libcontainers_apt_key: | -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.15 (GNU/Linux) diff --git a/inventory/service/group_vars/zuul-merger.yaml b/inventory/service/group_vars/zuul-merger.yaml deleted file mode 100644 index ef1f1522e8..0000000000 --- a/inventory/service/group_vars/zuul-merger.yaml +++ /dev/null @@ -1,19 +0,0 @@ -zuul_connections: - - name: 'gerrit' - driver: 'gerrit' - server: 'review.opendev.org' - canonical_hostname: 'opendev.org' - user: 'zuul' - sshkey: '/var/lib/zuul/ssh/id_rsa' - auth_type: 'digest' - - - name: 'github' - driver: 'github' - - - name: 'googlesource' - driver: 'gerrit' - server: 'gerrit-review.googlesource.com' - canonical_hostname: 'gerrit.googlesource.com' - user: 'git-infra-root.openstack.org' - stream_events: 'false' - auth_type: 'basic' diff --git a/inventory/service/group_vars/zuul-scheduler.yaml b/inventory/service/group_vars/zuul-scheduler.yaml index 8a008c55e8..6097a426c3 100644 --- a/inventory/service/group_vars/zuul-scheduler.yaml +++ b/inventory/service/group_vars/zuul-scheduler.yaml @@ -4,46 +4,6 @@ iptables_extra_public_tcp_ports: - 443 iptables_extra_allowed_groups: - {'protocol': 'tcp', 'port': '4730', 'group': 'zuul'} -zuul_connections: - - name: 'smtp' - driver: 'smtp' - server: 'localhost' - port: '25' - default_from: 'zuul@zuul.openstack.org' - default_to: 'zuul.reports@zuul.openstack.org' - - - name: 'gerrit' - driver: 'gerrit' - server: 'review.opendev.org' - canonical_hostname: 'opendev.org' - 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' - server: 'git.opendaylight.org' - baseurl: 'git.opendaylight.org/gerrit' - user: 'openstack-zuul' - sshkey: '/var/lib/zuul/ssh/id_rsa' - - - name: 'mysql' - driver: 'sql' - - - name: 'github' - driver: 'github' - app_key: '/etc/zuul/github.key' - rate_limit_logging: 'false' - - - name: 'googlesource' - driver: 'gerrit' - server: 'gerrit-review.googlesource.com' - canonical_hostname: 'gerrit.googlesource.com' - user: 'git-infra-root.openstack.org' - stream_events: 'false' - auth_type: 'basic' - zuul_ssl_cert_file_contents: | -----BEGIN CERTIFICATE----- MIICzjCCAbagAwIBAgIJAMV1mxY+iSJpMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV diff --git a/inventory/service/group_vars/zuul.yaml b/inventory/service/group_vars/zuul.yaml index 065c6dbc15..ec9c290ac5 100644 --- a/inventory/service/group_vars/zuul.yaml +++ b/inventory/service/group_vars/zuul.yaml @@ -6,3 +6,42 @@ zuul_known_hosts: | [review.opendev.org]:29418,[review.openstack.org]:29418,[104.130.246.32]:29418,[2001:4800:7819:103:be76:4eff:fe04:9229]:29418 {{ gerrit_ssh_rsa_pubkey_contents }} [git.opendaylight.org]:29418,[52.35.122.251]:29418,[2600:1f14:421:f500:7b21:2a58:ab0a:2d17]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyRXyHEw/P1iZr/fFFzbodT5orVV/ftnNRW59Zh9rnSY5Rmbc9aygsZHdtiWBERVVv8atrJSdZool75AglPDDYtPICUGWLR91YBSDcZwReh5S9es1dlQ6fyWTnv9QggSZ98KTQEuE3t/b5SfH0T6tXWmrNydv4J2/mejKRRLU2+oumbeVN1yB+8Uau/3w9/K5F5LgsDDzLkW35djLhPV8r0OfmxV/cAnLl7AaZlaqcJMA+2rGKqM3m3Yu+pQw4pxOfCSpejlAwL6c8tA9naOvBkuJk+hYpg5tDEq2QFGRX5y1F9xQpwpdzZROc5hdGYntM79VMMXTj+95dwVv/8yTsw== gearman_server: zuul01.openstack.org +zuul_connections: + - name: 'smtp' + driver: 'smtp' + server: 'localhost' + port: '25' + default_from: 'zuul@zuul.openstack.org' + default_to: 'zuul.reports@zuul.openstack.org' + + - name: 'gerrit' + driver: 'gerrit' + server: 'review.opendev.org' + canonical_hostname: 'opendev.org' + 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' + server: 'git.opendaylight.org' + baseurl: 'git.opendaylight.org/gerrit' + user: 'openstack-zuul' + sshkey: '/var/lib/zuul/ssh/id_rsa' + + - name: 'mysql' + driver: 'sql' + + - name: 'github' + driver: 'github' + app_key: '/etc/zuul/github.key' + rate_limit_logging: 'false' + + - name: 'googlesource' + driver: 'gerrit' + server: 'gerrit-review.googlesource.com' + canonical_hostname: 'gerrit.googlesource.com' + user: 'git-infra-root.openstack.org' + stream_events: 'false' + auth_type: 'basic'