From 9662805937cb0e9c3db5789019ab3052c334b79c Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Wed, 20 May 2020 14:54:20 -0700
Subject: [PATCH] Correct the test gearman certs
The existing test gearman cert+key combos were mismatched and therefore
invalid. This replaces them with newly generated test data, and moves
them into the test private hostvar files where the production private
data are now housed.
This removes the public production data as well; those certs are now
in the private hostvar files.
Change-Id: I6d7e12e2548f4c777854b8738c98f621bd10ad00
---
playbooks/group_vars/zuul-scheduler.yaml | 27 ----
playbooks/group_vars/zuul.yaml | 53 --------
.../group_vars/zuul-scheduler.yaml.j2 | 103 +++++++-------
.../zuul/templates/group_vars/zuul.yaml.j2 | 126 +++++++++++-------
4 files changed, 127 insertions(+), 182 deletions(-)
diff --git a/playbooks/group_vars/zuul-scheduler.yaml b/playbooks/group_vars/zuul-scheduler.yaml
index e135217735..8a008c55e8 100644
--- a/playbooks/group_vars/zuul-scheduler.yaml
+++ b/playbooks/group_vars/zuul-scheduler.yaml
@@ -44,33 +44,6 @@ zuul_connections:
stream_events: 'false'
auth_type: 'basic'
-gearman_server_ssl_cert: |
- -----BEGIN CERTIFICATE-----
- MIIEYTCCA0mgAwIBAgIJAKkAn3gh0LBPMA0GCSqGSIb3DQEBCwUAMIG5MQswCQYD
- VQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxDzANBgNVBAcMBkF1c3RpbjEdMBsGA1UE
- CgwUT3BlblN0YWNrIEZvdW5kYXRpb24xFzAVBgNVBAsMDkluZnJhc3RydWN0dXJl
- MR0wGwYDVQQDDBR6dXVsdjMub3BlbnN0YWNrLm9yZzEyMDAGCSqGSIb3DQEJARYj
- b3BlbnN0YWNrLWluZnJhQGxpc3RzLm9wZW5zdGFjay5vcmcwHhcNMTcwNjE2MjA1
- NDAyWhcNMjcwNjE0MjA1NDAyWjCBszELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRl
- eGFzMQ8wDQYDVQQHDAZBdXN0aW4xHTAbBgNVBAoMFE9wZW5TdGFjayBGb3VuZGF0
- aW9uMRcwFQYDVQQLDA5JbmZyYXN0cnVjdHVyZTEXMBUGA1UEAwwOZ2Vhcm1hbi5z
- ZXJ2ZXIxMjAwBgkqhkiG9w0BCQEWI29wZW5zdGFjay1pbmZyYUBsaXN0cy5vcGVu
- c3RhY2sub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3aMR61f/
- LZkP/acuqiCEiSFF4GI1ViNkOSPEq0CP4HfNckeW0///x6vI/uaR4MlF8g8qNFGB
- j2FCYRW1gEzS7TLoP3xYs4SMnvXvZRbdxcozOop506quLmlfPDF1o2GzLSQYDNXe
- WbpYiNM+EdgBjqLz4G5DdaXMMw2zYP21kbtSxJIvrpqeW/TKBGWDI2bBH81PFb9B
- gq1P4XxI/Aw7Ez6hApLV2D6DP7JidQUGOzvGw7LUEZjLEscQU7HH8j1qDvrM2gV4
- FRSRrtw8Yr/erBsaNr84guEZQREqiOjr1HvMZK5o1vGb69ArWSk9b8PW+A2uxvfS
- ukv7hvNsuCouHQIDAQABo3AwbjAJBgNVHRMEAjAAMCEGCWCGSAGG+EIBDQQUFhJj
- bGllbnQgY2VydGlmaWNhdGUwHQYDVR0OBBYEFImAuHnbfxpEEZwiiro9KEa8YA+1
- MB8GA1UdIwQYMBaAFFP8JfdXPn8mhZLaXMa8NQIJlmneMA0GCSqGSIb3DQEBCwUA
- A4IBAQBTNIVB758W+wBtCMlIRFUPBiR+w+7RRsY8HXME5unvO65PcsfLKQXOr3i/
- K2SliyyBliwKY+wtbvQZVltpBiloDqslSMD6veb5YsZDzTZ+x8xP1GEhcB3c6CsN
- 0RDJ/xUGv2IXgQW8kw+MINILr9iQA6fn9dBN0OqimlchPHtvA9gO7Rv+IV3zZP+Q
- yNWoBiZ6H5ANIt6vfcK0BHGDB6GXN9f1gpgsJd3l3vs3t/FgP1qYJiDd5VvcOXxt
- uJziOvdg7jte0u609MWj3DOdey4HsxlEU27w13kzGI6RpPquvl/YB8Y6WMAIL8in
- 1GRv9pIfENRRHOiC57p0RSQZZ/2V
- -----END CERTIFICATE-----
zuul_ssl_cert_file_contents: |
-----BEGIN CERTIFICATE-----
MIICzjCCAbagAwIBAgIJAMV1mxY+iSJpMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
diff --git a/playbooks/group_vars/zuul.yaml b/playbooks/group_vars/zuul.yaml
index 604fbc21cb..065c6dbc15 100644
--- a/playbooks/group_vars/zuul.yaml
+++ b/playbooks/group_vars/zuul.yaml
@@ -6,56 +6,3 @@ 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
-gearman_client_ssl_cert: |
- -----BEGIN CERTIFICATE-----
- MIIEYTCCA0mgAwIBAgIJAKkAn3gh0LBQMA0GCSqGSIb3DQEBCwUAMIG5MQswCQYD
- VQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxDzANBgNVBAcMBkF1c3RpbjEdMBsGA1UE
- CgwUT3BlblN0YWNrIEZvdW5kYXRpb24xFzAVBgNVBAsMDkluZnJhc3RydWN0dXJl
- MR0wGwYDVQQDDBR6dXVsdjMub3BlbnN0YWNrLm9yZzEyMDAGCSqGSIb3DQEJARYj
- b3BlbnN0YWNrLWluZnJhQGxpc3RzLm9wZW5zdGFjay5vcmcwHhcNMTcwNjE2MjMw
- MjQyWhcNMjcwNjE0MjMwMjQyWjCBszELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRl
- eGFzMQ8wDQYDVQQHDAZBdXN0aW4xHTAbBgNVBAoMFE9wZW5TdGFjayBGb3VuZGF0
- aW9uMRcwFQYDVQQLDA5JbmZyYXN0cnVjdHVyZTEXMBUGA1UEAwwOZ2Vhcm1hbi5j
- bGllbnQxMjAwBgkqhkiG9w0BCQEWI29wZW5zdGFjay1pbmZyYUBsaXN0cy5vcGVu
- c3RhY2sub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh3qSWIp
- w6kXS4IIPU7fPP2felHCtmZyfgKolYbq1iVafcc/EUHa1onlaM+w7OEHr68y3Qau
- SY6ifEsUWCKJlhu+UlHGwVIZliL02+9EAZ1DDs6OtxKa7nOIkWq8P8kRex234QVd
- y37+vV+/lDeCbLoGo5P0j51fnqy10afg2xRblmXgqeqaiJAvCmEnG9S9q9+gbisZ
- 1D2r+JtoTUMZtPY9NomvgdNuwmF5+VeO+CQepRWlA+0ysCFVgVwm++PNXETadHOj
- mOSJxiq2u6fysZb7ctHgGuu+Ce3PVwah+kK/PEXADs7SjhJruSmL1ap2izc6kTFW
- GSU/wkkPXtbWJwIDAQABo3AwbjAJBgNVHRMEAjAAMCEGCWCGSAGG+EIBDQQUFhJj
- bGllbnQgY2VydGlmaWNhdGUwHQYDVR0OBBYEFKTyA6hjUY8jNxOEM5zuU7qecogX
- MB8GA1UdIwQYMBaAFFP8JfdXPn8mhZLaXMa8NQIJlmneMA0GCSqGSIb3DQEBCwUA
- A4IBAQAiLYckNAx7GQGCSXC92R23o181FiCePuNAgCb4QsaQkA/JopaLrn11R33Y
- XO1C5fvsopKvcmEJKX0BJwNy41tz/rNmKXYy4hsPKYMsNgJQtYe98Mp+VHgAmtZ3
- U0v49mUJA4YiLs/QmB6bmLknl1XjzJvbLu3gfVSGsquDXN1TcHLZy2fQlD6/D7HF
- 2Zj44Af4b2xFcZc7J/iErIj8LGHx3alkGAgdXw+SQkgzDeXC/DhrXC1jVJQQQzfU
- /4GjbLiPBLb+QIAaBVv+iVVok22DSvMydjI4Zr89NXDWEOZc8oZ7nBf9Sv1+I0xB
- 6YQoN+t1YSx3G8AxPSZwyGlwhZo0
- -----END CERTIFICATE-----
-gearman_ssl_ca: |
- -----BEGIN CERTIFICATE-----
- MIIERzCCAy+gAwIBAgIJAKkAn3gh0LBOMA0GCSqGSIb3DQEBCwUAMIG5MQswCQYD
- VQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxDzANBgNVBAcMBkF1c3RpbjEdMBsGA1UE
- CgwUT3BlblN0YWNrIEZvdW5kYXRpb24xFzAVBgNVBAsMDkluZnJhc3RydWN0dXJl
- MR0wGwYDVQQDDBR6dXVsdjMub3BlbnN0YWNrLm9yZzEyMDAGCSqGSIb3DQEJARYj
- b3BlbnN0YWNrLWluZnJhQGxpc3RzLm9wZW5zdGFjay5vcmcwHhcNMTcwNjE2MjA1
- MjA3WhcNMjAwNjE1MjA1MjA3WjCBuTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRl
- eGFzMQ8wDQYDVQQHDAZBdXN0aW4xHTAbBgNVBAoMFE9wZW5TdGFjayBGb3VuZGF0
- aW9uMRcwFQYDVQQLDA5JbmZyYXN0cnVjdHVyZTEdMBsGA1UEAwwUenV1bHYzLm9w
- ZW5zdGFjay5vcmcxMjAwBgkqhkiG9w0BCQEWI29wZW5zdGFjay1pbmZyYUBsaXN0
- cy5vcGVuc3RhY2sub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- zTnzmZkB/P+C0eHFmPyU8myEmubRVw2vK1aqx0Y7bFMlXAVH6CodI6r4VpS4vGPL
- AfBGAmIZJlBuRysZHW3J6GuzhBFyBILHJX9PZkeJyHa3NU4ILDPMXAD/oWQnqlp1
- 3kYJ3xS1QWhPvaohC+Io3LErXOMp32mhrEmm3BGfWiXbV9STcseeLX6BKPdqBzaT
- d8RFkrvsEJTTjwIJLreyrphrtXu/VS9uEMWaHj4/94lLXn8fn3CuUfs48kPDTlaw
- vFg2lIGpfOui4s9Vhrafy1nrz1KzKHjhhnF80irrIo3kOkWaKeBuTyy7+MSx7PTi
- 5RgSoKTKyMbMA6nbCj73KQIDAQABo1AwTjAdBgNVHQ4EFgQUU/wl91c+fyaFktpc
- xrw1AgmWad4wHwYDVR0jBBgwFoAUU/wl91c+fyaFktpcxrw1AgmWad4wDAYDVR0T
- BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAe/6S1DWRtXwzBgwTCW7FR3IrpZzP
- 4eN3TUbJy6tvff+iY6+96WV9vyH62NU8oEn5TUqy8r+EiOchbXJq8pvlPAcwdaeC
- a9pjJku40oVai0pncqDnF/WOiXNkW71bRs/qQtIuVwKwVm9OyizjWsQtjm4Ycpju
- 92liz5Q/ZZu+7eIufQYRr7lthgmTLCjqeS4qxiY7Y03ZLZpvEL+KVskkjPzHvzTO
- S1Rq0t3ssb4uH78rvXj1Q/C2gVucUBE86P9AckSZtANGlmiKBnO6Lc1xQbsFyfSn
- Xbt2g9IiP3nTEapCx/M8/Zl5M+XwK7pbQWdtwGnvGPoeFNV1sVT4iO1dLg==
- -----END CERTIFICATE-----
diff --git a/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2 b/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2
index 6ec6ab1d60..4c28636436 100644
--- a/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2
@@ -1,57 +1,58 @@
zuul_scheduler_start: true
gearman_server_ssl_key: |
- -----BEGIN RSA PRIVATE KEY-----
- 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
- -----END RSA PRIVATE 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
diff --git a/playbooks/zuul/templates/group_vars/zuul.yaml.j2 b/playbooks/zuul/templates/group_vars/zuul.yaml.j2
index 670207f044..80b5c156a5 100644
--- a/playbooks/zuul/templates/group_vars/zuul.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/zuul.yaml.j2
@@ -1,55 +1,79 @@
gearman_client_ssl_key: |
- -----BEGIN RSA PRIVATE KEY-----
- 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
- -----END RSA PRIVATE 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