Remove gearman from Zuul

Zuul no longer uses gearman, so we can remove the infrastructure around it. Change-Id: I3613d812971add4733d3fe509ee22835e5814ec6
2022-01-27 16:54:49 -08:00 · 2022-01-27 16:54:49 -08:00 · 14f4a20628
commit 14f4a20628
parent 535b7162a1
12 changed files with 0 additions and 259 deletions
--- a/inventory/service/group_vars/zuul-scheduler.yaml
+++ b/inventory/service/group_vars/zuul-scheduler.yaml
@ -2,8 +2,6 @@ iptables_extra_public_tcp_ports:
  - 79
  - 80
  - 443
-iptables_extra_allowed_groups:
-  - {'protocol': 'tcp', 'port': '4730', 'group': 'zuul'}
 zuul_ssl_cert_file_contents: |
  -----BEGIN CERTIFICATE-----
  MIICzjCCAbagAwIBAgIJAMV1mxY+iSJpMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
--- a/inventory/service/group_vars/zuul.yaml
+++ b/inventory/service/group_vars/zuul.yaml
@ -6,7 +6,6 @@ zuul_known_hosts: |
  [review.opendev.org]:29418,[review.openstack.org]:29418 {{ gerrit_ssh_rsa_pubkey_contents }}
  [review02.opendev.org],[199.204.45.33]:29418,[2604:e100:1:0:f816:3eff:fe52:22de]: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: zuul02.opendev.org
 zuul_connections:
  - name: 'smtp'
    driver: 'smtp'
--- a/inventory/service/host_vars/zuul02.opendev.org.yaml
+++ b/inventory/service/host_vars/zuul02.opendev.org.yaml
@ -1,4 +1,3 @@
-gearman_server: 127.0.0.1
 letsencrypt_certs:
  zuul02-opendev-main:
    - zuul.opendev.org
--- a/playbooks/roles/zuul-scheduler/files/gearman-logging.conf
+++ b/playbooks/roles/zuul-scheduler/files/gearman-logging.conf
@ -1,34 +0,0 @@
-[loggers]
-keys=root,gear
-
-[handlers]
-keys=console,normal
-
-[formatters]
-keys=simple
-
-[logger_root]
-level=WARNING
-handlers=console
-
-[logger_gear]
-level=DEBUG
-handlers=normal
-qualname=gear
-
-[handler_console]
-level=WARNING
-class=StreamHandler
-formatter=simple
-args=(sys.stdout,)
-
-[handler_normal]
-level=WARNING
-class=logging.handlers.WatchedFileHandler
-formatter=simple
-args=('/var/log/zuul/gearman-server.log',)
-
-[formatter_simple]
-format=%(asctime)s %(levelname)s %(name)s: %(message)s
-datefmt=
-class=zuul.lib.logutil.MultiLineFormatter
--- a/playbooks/roles/zuul-scheduler/tasks/main.yaml
+++ b/playbooks/roles/zuul-scheduler/tasks/main.yaml
@ -63,11 +63,6 @@
    src: logging.conf
    dest: /etc/zuul/logging.conf

- name: Install geraman logging config
-  copy:
-    src: gearman-logging.conf
-    dest: /etc/zuul/gearman-logging.conf
-
 - name: Rotate logs
  include_role:
    name: logrotate
@ -82,12 +77,6 @@
    logrotate_file_name: /var/log/zuul/debug.log
    logrotate_rotate: 30

- name: Rotate gearman logs
-  include_role:
-    name: logrotate
-  vars:
-    logrotate_file_name: /var/log/zuul/gearman-server.log
-
 - name: Install zuul-client script
  copy:
    src: zuul-client
--- a/playbooks/roles/zuul/tasks/main.yaml
+++ b/playbooks/roles/zuul/tasks/main.yaml
@ -28,56 +28,6 @@
    zk_ca_cert_dir_owner: "{{ zuul_user_id }}"
    zk_ca_cert_dir_group: "{{ zuul_group_id }}"

- name: Create Zuul SSL dir
-  file:
-    state: directory
-    path: /etc/zuul/ssl
-    owner: "{{ zuul_user }}"
-    group: "{{ zuul_group }}"
-
- name: Write Gearman SSL CA
-  copy:
-    content: "{{ gearman_ssl_ca }}"
-    dest: /etc/zuul/ssl/gearman-ca.pem
-    owner: "{{ zuul_user }}"
-    group: "{{ zuul_group }}"
-    mode: 0644
-
- name: Write Gearman Client SSL Cert
-  copy:
-    content: "{{ gearman_client_ssl_cert }}"
-    dest: /etc/zuul/ssl/gearman-client.pem
-    owner: "{{ zuul_user }}"
-    group: "{{ zuul_group }}"
-    mode: 0644
-
- name: Write Gearman Client SSL Key
-  when: gearman_client_ssl_key is defined
-  copy:
-    content: "{{ gearman_client_ssl_key }}"
-    dest: /etc/zuul/ssl/gearman-client.key
-    owner: "{{ zuul_user }}"
-    group: "{{ zuul_group }}"
-    mode: 0640
-
- name: Write Gearman Server SSL Cert
-  when: gearman_server_ssl_cert is defined
-  copy:
-    content: "{{ gearman_server_ssl_cert }}"
-    dest: /etc/zuul/ssl/gearman-server.pem
-    owner: "{{ zuul_user }}"
-    group: "{{ zuul_group }}"
-    mode: 0644
-
- name: Write Gearman Server SSL Key
-  when: gearman_server_ssl_key is defined
-  copy:
-    content: "{{ gearman_server_ssl_key }}"
-    dest: /etc/zuul/ssl/gearman-server.key
-    owner: "{{ zuul_user }}"
-    group: "{{ zuul_group }}"
-    mode: 0640
-
 - name: Write Zuul Conf File
  template:
    src: zuul.conf.j2
--- a/playbooks/roles/zuul/templates/zuul.conf.j2
+++ b/playbooks/roles/zuul/templates/zuul.conf.j2
@ -1,23 +1,3 @@
-[gearman]
-server={{ gearman_server }}
-check_job_registration=true
-ssl_ca=/etc/zuul/ssl/gearman-ca.pem
-ssl_cert=/etc/zuul/ssl/gearman-client.pem
-{% if gearman_client_ssl_key is defined -%}
-ssl_key=/etc/zuul/ssl/gearman-client.key
-{% endif -%}
-
-[gearman_server]
-start=true
-log_config=/etc/zuul/gearman-logging.conf
-ssl_ca=/etc/zuul/ssl/gearman-ca.pem
-{% if gearman_server_ssl_cert is defined -%}
-ssl_cert=/etc/zuul/ssl/gearman-server.pem
-{% endif -%}
-{% if gearman_server_ssl_key is defined -%}
-ssl_key=/etc/zuul/ssl/gearman-server.key
-{% endif -%}
-
 [scheduler]
 tenant_config=/etc/zuul/main.yaml
 log_config=/etc/zuul/logging.conf
--- a/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2
@ -1,59 +1,5 @@
 zuul_client_auth_token: testauthtoken
 zuul_scheduler_start: true
-
-gearman_server_ssl_key: |
-  -----BEGIN PRIVATE KEY-----
-  MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDOoTzdDZ0znb8U
-  E6CJdyyo0u5BvJn0NkZAMnqbc9+uO4gwUYiX88IHCoww8eo2h1JK+nG2qyXYTkE/
-  QtJjQBPcvcyXJoEdaD6lMCraRg53VwSgGpZ/SDRmGmlIBC26OL2ePwORvDFBC2nm
-  uIlyxzlMmzz4delnfH+wIrHOjZ4aiS2Chdt2H3D6KOgT7xoKls4iXXJm56MfK1AG
-  AZ/lmsWsF2z+iz1Jfn/qzp5nKvvR7TqcOH4KshfpBSE0BvVNF7Qd4tUgv32/jK0U
-  mWYba7OdFv70xdK4XTk6V6VsRX5m7XH+tgOg1GvEDrn/wBwmCMbPWAFXJBjm/9xV
-  t4Mnkkg7AgMBAAECggEAJiMcWLBqk1xKKCp3NugIFiDYWMm2oJxj2vV2K7r3TfEu
-  8bwaufEDnskTlvUPhYD0b2JKGqz8DzBiWoq6yhbJk7R0TnGM4yCab2K0hhToFp64
-  +9PscxGgmjfFtsUOq5BNbyeyQPO7I4Y3xZ3JwKWErd75IeKhcbhI2PmOV9FLnRnf
-  jMLUcTffGqqSM+TZNgrvXTMfPIEe9SPyApQ0+BD3BcK8quUcZ2DCM7QvfOpjf4YY
-  NxSZ9wI36LXXvLKIEIR7KcS/EOrNgSq4eJ4t2TYsw5lAv3YwrBg3NGkKO+4MWaev
-  mA84O2xl48voA5VBuA1I7BC2ZeJ04Ws/VpufM34EAQKBgQDxWzH8LD2pBO6nHFwv
-  oAx5nINR4EWP0K/gr3/amOjgFr5Qx+u2JG/g/RDaI02LtT+Mc+YFrpktUX3KF8n4
-  +1ei16jUmKIDcjTOXWCXVZEkeAHmCBoebJVWNInWMKQBD1yrr4xPPFNhZYgprnre
-  6P1NIwM3rPEEK25IOr283f1hqQKBgQDbKqnbemIc5h+Rl5gOayE+AGGm97ngCrIk
-  BnXCVLJBNU+TzEHpwj0l8gIZ6eumwma+eKS71sKXDxxTVOjn7/YACqFvJFnJSXG9
-  dboGfU2QoZGefyXx4JZguUUIsaKrO1/RJo2XuQ/phMCOopkbGCfmLHdGekQffJTy
-  4YQmIwmRQwKBgDC66OyxQgHOLSEwaKx09A/ZueneDi1rRRdoV7gbB2m3LdXBh6XO
-  1YfnkG96kT2T6rDA9cBP8D1mJq+W/gB3PspyIHRMHOn1NRQ1Zjsn25YxZLC9Egjy
-  g3RUR0AnsfVE1MEVQI7+7xbLGSLRR52aDQp190BWepMM8cdDlOt9JpuBAoGAGsNr
-  +JxKTOMhKcNMUz5r0cl0I1KPBTfpJxMO4Es9dU8QR6kix2vr0a1q6kUxfKyypUHQ
-  RAvmuVGkEN0GkAQykzC5I/xZZoYseIlezRoSFb5VLPiz5oSZeHhHYNdoWOaoPb8q
-  fUOhGNAYP5LFhZR+ktINQrL9jKbG/Z3iaFHRAkcCgYEA3o/JbZsryItdirGZc/bO
-  bQvZFt1o6MzilW+FStodNwhdFUGIlYzgJzHCEIEWzNK/OI+LJue76ja6OzZpmq17
-  Rd6ktWTGtzV5YfDQ1qPuuKPlYCTdOY0xtelQev5kRmpqsyNE9nuZh4XZpPW5UeWH
-  R0NPGgdmXIqSKWMH1scunu0=
-  -----END PRIVATE KEY-----
-gearman_server_ssl_cert: |
-  -----BEGIN CERTIFICATE-----
-  MIIDyzCCArOgAwIBAgIUeytX2NjLcScflSyhmWNp1VF09FswDQYJKoZIhvcNAQEL
-  BQAwWDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFTATBgNVBAoM
-  DENvbXBhbnkgTmFtZTEMMAoGA1UECwwDT3JnMQ8wDQYDVQQDDAZjYXJvb3QwHhcN
-  MjAwNTIwMjE0MTAxWhcNMzAwMjE3MjE0MTAxWjBqMQswCQYDVQQGEwJVUzETMBEG
-  A1UECAwKQ2FsaWZvcm5pYTEQMA4GA1UEBwwHT2FrbGFuZDEVMBMGA1UECgwMQ29t
-  cGFueSBOYW1lMQwwCgYDVQQLDANPcmcxDzANBgNVBAMMBnNlcnZlcjCCASIwDQYJ
-  KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6hPN0NnTOdvxQToIl3LKjS7kG8mfQ2
-  RkAyeptz3647iDBRiJfzwgcKjDDx6jaHUkr6cbarJdhOQT9C0mNAE9y9zJcmgR1o
-  PqUwKtpGDndXBKAaln9INGYaaUgELbo4vZ4/A5G8MUELaea4iXLHOUybPPh16Wd8
-  f7Aisc6NnhqJLYKF23YfcPoo6BPvGgqWziJdcmbnox8rUAYBn+WaxawXbP6LPUl+
-  f+rOnmcq+9HtOpw4fgqyF+kFITQG9U0XtB3i1SC/fb+MrRSZZhtrs50W/vTF0rhd
-  OTpXpWxFfmbtcf62A6DUa8QOuf/AHCYIxs9YAVckGOb/3FW3gyeSSDsCAwEAAaN7
-  MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg
-  Q2VydGlmaWNhdGUwHQYDVR0OBBYEFFj+HG+/Jw/4jRbbfBehLmFTu3MDMB8GA1Ud
-  IwQYMBaAFE0bTWLH0mxphSVT/cWRoSK0oepGMA0GCSqGSIb3DQEBCwUAA4IBAQCh
-  UMb3OPBOriRJJ8w4qpvZYSZaMoY2qUvSC18hh+MUsT5iXKyZklnOxa3Hy+XkMm2Y
-  EK9nTVTvtsgQL3Jrut8BI1sKKG9/M7UBXIaUtPajTs30I6JytxDQtmaFDUXKnZL3
-  PkR77gW/aCPSLP8PFmP6+8rtjW1ZyW8MjV5VRLu574RPCodr6VSg3rg6JtLP1sj/
-  3ozGTfnAevyQa6sgc5UG7sgVdjabBu5VQ66vwOvn5VfCkGkK7tvELy9yyPHM54i4
-  4oO44aNCa+UaK0yqXOMqk4EaaeNMLdL+M6Yhq6Vka6ny8GOf10LQtjSs+SnfCrMB
-  QuEJrClo9hrylwJ1ntKu
-  -----END CERTIFICATE-----
 zuul_github_app_key: |
  -----BEGIN OPENSSH PRIVATE KEY-----
  b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
--- a/playbooks/zuul/templates/group_vars/zuul.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/zuul.yaml.j2
@ -20,82 +20,6 @@ zuul_connections:

 zuul_local_auth_secret: testsecret

-gearman_client_ssl_key: |
-  -----BEGIN PRIVATE KEY-----
-  MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDVr8aQW9tQLmDW
-  Kbm8oiKvMrmBOFaenDqu/RU3aPYYFXHFfeXBGJ3QVf+qrRQR6Vk/aKWrL1PDgP11
-  G0/5tCrTKn1XVAfJd2hGbo24TyaiK5mvQx2h3Ij3sFHyn7iJ+hgDeS7UCm0kEkKi
-  imHAUJyqCHy0EpfdhnLRvqDIgKjKyX1PcL1q7B+eLN2t3m9XIE+Lfzx6ZaoqxML9
-  nahM//JWvD5U4UDvyH+5jJd7mShwmkY+h0Z0g0l+NphgVSAQlXp/XLkvb3cKagll
-  VzhS+QmYWxEA9lwEE21qW8fjaYkGIfbYHpE+NJGf7K1FtvoGArVGTsH+Q+MJasjb
-  8mTEfsUZAgMBAAECggEBAKrSzRLES+uqV8F9M71HhCC4lTFm/1/mlscjDN3x66HP
-  KtdtUMlvy2EsDqm7mSrEd5NILgBOYlENAhGnFuUQkZekBPVV+K+m5FZBtMudgs3r
-  uv0v0zV9HoWbj7c81gJ/SskkDDp4Z02Jx3k21PQvvT30cPRnVL5D5/Aiy1fd+pG4
-  0X89QA22rvUH0NuvEuOfom13c8uQZLBEyhtphwxgq5RMyQD5sDwC4e4heTAi/L6f
-  Njd9fki6HHswQWPr/86wv5SPASrO/gMLZlwxnWM0wNPcvC3hCkoH1WfToByH2RIq
-  fzMH5m26u9YLnnWUQumcPzhSB+x6s0VkebUTcisQXX0CgYEA8A0ggQ/lVW3JXQK4
-  cohysCShE/wd+LTugjVsQQss+hFKCBxxmR6gHumXjlxKT+eR+zKf0IGMV+T9QiHn
-  oQazrAjDzXUFl+dc26CjBUx5NcuqB8I609Gcql7pwM4XUn1JzaTNQHxnhTJMBO50
-  EG8tJJmNpDFfZ4aJ/oHFnvjwMZsCgYEA4+I60UlPWT4mU4Qwoc5CpBebbdmPjih+
-  YVfzZLx6NbFR6qFIpFqk25xbActxZc+YnyMMGD4k006CIDR7bHKWsAKXx1wvR8wS
-  nEPbMv83zrb7039LbIuFi7ppCEAXaG3JNPvVM0ZSjhzW7XoGLYPIGWbH4z6ydRcT
-  teA00bmfGVsCgYEAt2E/0HhlOJLK/hvC7fPgsUD6MHssJj+J6LyI+1NfQ5WLmZCp
-  E1D6/0JxfdZxCoOb2Gr+/VjJ7qdG9YtTGIc3IJf9hGn+IOIk5L7daoHWIst4E79E
-  E2aQqPIi3iBSXrjJdaiNB9NBfdZDjoze62MS+F+5fZIeEMcNifh3EI+ZZjsCgYEA
-  4W+PIjV00uNBxQMTnS5QDMbx0xUUB90VUTVRqgkumOlHEWbmVvj49+xQt5DMKJza
-  7iscrurjQUr8PeHNa7ZcTdjyz5zphQxkKMSUF3oVemDY9RyLv+Cyh00s1KWawotB
-  LjIncqcRylbLZHh/ng0tKbvc6HjA0Ea5EAayGfuYYdsCgYEAzxU83F83MZ1sZo7q
-  xxIk9o7eY84YqWvzObyIEzIfD1W35siN5OI048l3cOXUsLH5Nuw5vkldS5EoTaiO
-  E1lIdwXnYBR4cb9SA1TiwFf6vS3ZZ9D0xdGlJHtH+NeeXTVd1IYjHMjs+q5XtnPD
-  PYmTiVKNO1IKXZpHy/YhOy9+c08=
-  -----END PRIVATE KEY-----
-gearman_client_ssl_cert: |
-  -----BEGIN CERTIFICATE-----
-  MIIDyzCCArOgAwIBAgIUeytX2NjLcScflSyhmWNp1VF09FowDQYJKoZIhvcNAQEL
-  BQAwWDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFTATBgNVBAoM
-  DENvbXBhbnkgTmFtZTEMMAoGA1UECwwDT3JnMQ8wDQYDVQQDDAZjYXJvb3QwHhcN
-  MjAwNTE5MjM0MDM2WhcNMzAwMjE2MjM0MDM2WjBqMQswCQYDVQQGEwJVUzETMBEG
-  A1UECAwKQ2FsaWZvcm5pYTEQMA4GA1UEBwwHT2FrbGFuZDEVMBMGA1UECgwMQ29t
-  cGFueSBOYW1lMQwwCgYDVQQLDANPcmcxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJ
-  KoZIhvcNAQEBBQADggEPADCCAQoCggEBANWvxpBb21AuYNYpubyiIq8yuYE4Vp6c
-  Oq79FTdo9hgVccV95cEYndBV/6qtFBHpWT9opasvU8OA/XUbT/m0KtMqfVdUB8l3
-  aEZujbhPJqIrma9DHaHciPewUfKfuIn6GAN5LtQKbSQSQqKKYcBQnKoIfLQSl92G
-  ctG+oMiAqMrJfU9wvWrsH54s3a3eb1cgT4t/PHplqirEwv2dqEz/8la8PlThQO/I
-  f7mMl3uZKHCaRj6HRnSDSX42mGBVIBCVen9cuS9vdwpqCWVXOFL5CZhbEQD2XAQT
-  bWpbx+NpiQYh9tgekT40kZ/srUW2+gYCtUZOwf5D4wlqyNvyZMR+xRkCAwEAAaN7
-  MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg
-  Q2VydGlmaWNhdGUwHQYDVR0OBBYEFINAuvkSw0B5e+yCN/FnFTOi4ojeMB8GA1Ud
-  IwQYMBaAFE0bTWLH0mxphSVT/cWRoSK0oepGMA0GCSqGSIb3DQEBCwUAA4IBAQCf
-  1+QNFCvMdJbvI6gkGXutX5AvMeSjF+Xa/dUP0RWftjDqMDLttdvy9lO0+GANN12r
-  m+/H776cfkkBX9wGuhKr266HG2RY5XArzU1BK9daoeObTFjmiwa6gHqwZCrYxXX+
-  bXssYdCp8L381CaNJ3h9oo/SI7D07AggI+PNkqJ83fOdbmR7RJdmE/HGoiJxJuaZ
-  q7VVIJ3JMAeSy5qLP93TYiwIl11l13NAlbmfwwDGIIMmT+YITPdAPx1EJMsswSid
-  Y6LQGelALAT/QqWKyefk7KesyDuf6K/kTha/NJ4QoewsyxknI/4knin5TthDurjn
-  cdZnkPPuXa3cgbw6tSoB
-  -----END CERTIFICATE-----
-gearman_ssl_ca: |
-  -----BEGIN CERTIFICATE-----
-  MIIDkTCCAnmgAwIBAgIUeytX2NjLcScflSyhmWNp1VF09FkwDQYJKoZIhvcNAQEL
-  BQAwWDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFTATBgNVBAoM
-  DENvbXBhbnkgTmFtZTEMMAoGA1UECwwDT3JnMQ8wDQYDVQQDDAZjYXJvb3QwHhcN
-  MjAwNTE5MjM0MDM2WhcNMzAwMjE2MjM0MDM2WjBYMQswCQYDVQQGEwJVUzETMBEG
-  A1UECAwKQ2FsaWZvcm5pYTEVMBMGA1UECgwMQ29tcGFueSBOYW1lMQwwCgYDVQQL
-  DANPcmcxDzANBgNVBAMMBmNhcm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-  AQoCggEBALK6G/ocHq7XZ+uLhdUrqUwOaBOUlDJNQVxfYlc1BSWvfkDoaEEfB4sg
-  R64D3en3XSQ6oq5OuhUBP2JbPpTNEwHRW8DLwFMH5uCYF0z4C02nDHUOfCzEebB4
-  tgfs81wUI1IPYtbHD7/h9hOpNpBoAkQJ2rC+hQBf5OXeRf7OSMPnhd20GgEKaT3m
-  09nhBn7yu+6S7auwwci26H2tYQaMIcACXq4K036iw+43WK/ACBfam9WxNMR/5A8w
-  X2KBeGoRHve6H1j5unoMBJOpLn7aU2oMfcFytvrht0KbP0LA/6WuN3Vfr9lnpKQZ
-  cxfJVvyoTnO+NI49gk+U2kyisWwhfqUCAwEAAaNTMFEwHQYDVR0OBBYEFE0bTWLH
-  0mxphSVT/cWRoSK0oepGMB8GA1UdIwQYMBaAFE0bTWLH0mxphSVT/cWRoSK0oepG
-  MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAEpiq7UOeIAKiOHq
-  SWyFuRAKb4ystlj2Cwn0tSFiVlXdw9w+zGdJfc0zWEDcbXtQSdH+Ryst1itbsOXe
-  LoYjPun5xQUsyF60D82MlkMY86fm84yr3LYzHhewLCeuMaqMDi3Rp9wmbekFmOUi
-  UfaGmwWBOYsJFZcr2Pt3FQHpFhlNbkQKV9Ae/qlQd6f+PinaC6Yo1Jh6xijMFrkW
-  CJDbN1DRofk3Cf5IUiDlQTC1LEO0mhsKO+4aCzS21mJ570xUXqcOW7Kv4jkVq2uZ
-  fHxj5PuDeJvYsMiheeWUV2GAkqI9fEj/SadrIVkesR0eF8AxLyRzboSZbmYWqbX7
-  MojI4IA=
-  -----END CERTIFICATE-----
 zuul_ssh_private_key_contents: |
  -----BEGIN OPENSSH PRIVATE KEY-----
  b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
--- a/testinfra/test_zuul_executor.py
+++ b/testinfra/test_zuul_executor.py
@ -26,6 +26,3 @@ def test_iptables(host):
    ]
    for rule in needed_rules:
        assert rule in rules
-
-    for rule in rules:
-        assert '--dport 4730' not in rule
--- a/testinfra/test_zuul_merger.py
+++ b/testinfra/test_zuul_merger.py
@ -21,6 +21,5 @@ def test_iptables(host):
    rules = util.verify_iptables(host)

    for rule in rules:
-        assert '--dport 4730' not in rule
        assert '--dport 79' not in rule
        assert '--dport 7900' not in rule
--- a/testinfra/test_zuul_scheduler.py
+++ b/testinfra/test_zuul_scheduler.py
@ -24,11 +24,5 @@ def test_iptables(host):
    ips = util.get_ips('ze01.opendev.org', socket.AF_INET)
    assert len(ips) > 0

-    # Make sure that the gearman port is open to executors on the scheduler
-    for ip in util.get_ips('ze01.opendev.org', socket.AF_INET):
-        zuul = ('-A openstack-INPUT -s %s/32 -p tcp -m state --state NEW'
-                ' -m tcp --dport 4730 -j ACCEPT' % ip)
-        assert zuul in rules
-
    for rule in rules:
        assert '--dport 7900' not in rule