From a187f1665b84ed8bc8d235b49f95e7e4db836e7e Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sat, 20 Jan 2018 00:57:04 +0000
Subject: [PATCH] Decommission zuulv3.openstack.org server
Now that zuulv3.openstack.org has been replaced by the larger
zuul01.openstack.org server, the former can be cleaned out of our
configuration in preparation for server deletion.
Change-Id: Icc1d545906e5615e2a205b98f364a084e1d22895
---
doc/source/zuulv3.rst | 3 +-
hiera/common.yaml | 1 -
hiera/fqdn/zuulv3.openstack.org.yaml | 71 --------------------
manifests/site.pp | 97 ----------------------------
playbooks/remote_puppet_else.yaml | 2 +-
playbooks/remote_puppet_git.yaml | 2 +-
6 files changed, 4 insertions(+), 172 deletions(-)
delete mode 100644 hiera/fqdn/zuulv3.openstack.org.yaml
diff --git a/doc/source/zuulv3.rst b/doc/source/zuulv3.rst
index f99bb26b2b..3d0f2f4cc8 100644
--- a/doc/source/zuulv3.rst
+++ b/doc/source/zuulv3.rst
@@ -19,8 +19,9 @@ At a Glance
:Hosts:
* http://zuul.openstack.org
- * zuul.openstack.org
+ * zuul*.openstack.org
* ze*.openstack.org
+ * zm*.openstack.org
:Puppet:
* https://git.openstack.org/cgit/openstack-infra/puppet-zuul/tree/
* https://git.openstack.org/cgit/openstack-infra/puppet-openstackci/tree/manifests/zuul.pp
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 989679a651..d76a9c8998 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -530,7 +530,6 @@ cacti_hosts:
- zm07.openstack.org
- zm08.openstack.org
- zuul01.openstack.org
-- zuulv3.openstack.org
infracloud_hpuseast_ssl_cert_file_contents: |
-----BEGIN CERTIFICATE-----
MIIEijCCAvICCQDZLTPao6k1yjANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UEBhMC
diff --git a/hiera/fqdn/zuulv3.openstack.org.yaml b/hiera/fqdn/zuulv3.openstack.org.yaml
deleted file mode 100644
index 44d5a21985..0000000000
--- a/hiera/fqdn/zuulv3.openstack.org.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-zuul_connections:
- - name: 'smtp'
- driver: 'smtp'
- server: 'localhost'
- port: '25'
- default_from: 'zuul@zuulv3.openstack.org'
- default_to: 'zuul.reports@zuulv3.openstack.org'
-
- - name: 'gerrit'
- driver: 'gerrit'
- server: 'review.openstack.org'
- canonical_hostname: 'git.openstack.org'
- user: 'zuul'
- sshkey: '/var/lib/zuul/ssh/id_rsa'
- gitweb_url_template: 'https://git.openstack.org/cgit/{project.name}/commit/?id={sha}'
-
- - name: 'mysql'
- driver: 'sql'
-
- - name: 'github'
- driver: 'github'
- app_key: '/etc/zuul/github.key'
-
-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
- BAMMFHp1dWx2My5vcGVuc3RhY2sub3JnMB4XDTE3MDYwMjE5MzUwMloXDTI3MDUz
- MTE5MzUwMlowHzEdMBsGA1UEAwwUenV1bHYzLm9wZW5zdGFjay5vcmcwggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvgAf85YVjjBTHYJnIx8VA1VvSAidD
- LHp2Yn+7DgUfHXjNdpftTgvWxnzXMFaglNzrNrixGNlkg1sdGDJ+DB/mvptKJUEH
- WMfOVI98Eo0dx5w+lcP8XGTg6/SY59+PiqNpCmi+T49axQO2XKNlt+ZJsSVaEhEj
- E2OrkZY+A8RFj07TUjSMv/pmo3AxgVjFoWszDT8pj30CTT3lg3eXXJwlqrH/P9IQ
- FnwRSt3sR60ahFFJnvHdL1FJl/I0W5nWD6LNEpX7ryaIUIqMhQpQjGDpvG77ntfW
- A5zhBVWPC7p2k6OaUD6AjlPMJLZh5YbyGaRN4l2Z4oizBGjoq1Qv9QehAgMBAAGj
- DTALMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAOFIxTTiw10jWRKQuRKU
- KskncSNj3ZxSjwPTOQs++hLjYYYlKA4LbWwokp7u5rTpJP/NHYLHXIda6l/Ne3JG
- +Mby/vu0TKMX2z+0IQx3MZG7b+4NkH4jg40Q+Y879n0jvOfBplHtJB1UmQYk51fs
- Hbrb6vvxeLRJ74JZX6t756gZnagzAoLj7DtmTfruUVjD/kRJK8gUCyKMNvN6PH3u
- 5Ls4WwOME+bFdFcxBJjj1LSKGlZoE22mSVlRqHvVXVfM9XTolvw5PequFhiPXYyj
- ESN9QfRuVeKltTl8NdDgwlYjBBUYR5omuX5LLWUSXuvQK/dYM4ahERf3ivbXMjhF
- M+Q=
- -----END CERTIFICATE-----
diff --git a/manifests/site.pp b/manifests/site.pp
index 8b35eea5e7..01a66b2d76 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -197,7 +197,6 @@ node /^graphite\d*\.openstack\.org$/ {
{protocol => 'udp', port => '8125', hostname => 'nl02.openstack.org'},
{protocol => 'udp', port => '8125', hostname => 'nl03.openstack.org'},
{protocol => 'udp', port => '8125', hostname => 'zuul01.openstack.org'},
- {protocol => 'udp', port => '8125', hostname => 'zuulv3.openstack.org'},
{protocol => 'udp', port => '8125', hostname => 'zm01.openstack.org'},
{protocol => 'udp', port => '8125', hostname => 'zm02.openstack.org'},
{protocol => 'udp', port => '8125', hostname => 'zm03.openstack.org'},
@@ -776,7 +775,6 @@ node /^zk\d+\.openstack\.org$/ {
{protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'zuul01.openstack.org'},
- {protocol => 'tcp', port => '2181', hostname => 'zuulv3.openstack.org'},
# Zookeeper election
{protocol => 'tcp', port => '2888', hostname => 'zk01.openstack.org'},
{protocol => 'tcp', port => '2888', hostname => 'zk02.openstack.org'},
@@ -924,7 +922,6 @@ node 'nodepool.openstack.org' {
{protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'zuul01.openstack.org'},
- {protocol => 'tcp', port => '2181', hostname => 'zuulv3.openstack.org'},
],
sysadmins => hiera('sysadmins', []),
iptables_public_tcp_ports => [80],
@@ -1298,100 +1295,6 @@ node /^ze\d+\.openstack\.org$/ {
}
}
-# Node-OS: xenial
-node 'zuulv3.openstack.org' {
- $gerrit_server = 'review.openstack.org'
- $gerrit_user = 'zuul'
- $gerrit_ssh_host_key = hiera('gerrit_zuul_user_ssh_key_contents')
- $zuul_ssh_private_key = hiera('zuul_ssh_private_key_contents')
- $zuul_url = "http://${::fqdn}/p"
- $git_email = 'zuul@openstack.org'
- $git_name = 'OpenStack Zuul'
- $revision = 'master'
-
- class { 'openstack_project::server':
- iptables_public_tcp_ports => [79, 80, 443],
- iptables_allowed_hosts => [
- {protocol => 'tcp', port => '4730', hostname => 'ze01.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze02.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze03.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze04.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze05.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze06.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze07.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze08.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze09.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'ze10.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'zm01.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'zm02.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'zm03.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'zm04.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'zm05.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'zm06.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'zm07.openstack.org'},
- {protocol => 'tcp', port => '4730', hostname => 'zm08.openstack.org'},
- ],
- sysadmins => hiera('sysadmins', []),
- }
-
- class { '::project_config':
- url => 'https://git.openstack.org/openstack-infra/project-config',
- }
-
- # NOTE(pabelanger): We call ::zuul directly, so we can override all in one
- # settings.
- class { '::zuul':
- gerrit_server => $gerrit_server,
- gerrit_user => $gerrit_user,
- zuul_ssh_private_key => $zuul_ssh_private_key,
- git_email => $git_email,
- git_name => $git_name,
- revision => $revision,
- python_version => 3,
- zookeeper_hosts => 'nodepool.openstack.org:2181',
- zookeeper_session_timeout => 40,
- zuulv3 => true,
- connections => hiera('zuul_connections', []),
- connection_secrets => hiera('zuul_connection_secrets', []),
- zuul_status_url => 'http://127.0.0.1:8001/openstack',
- zuul_web_url => 'http://127.0.0.1:9000/openstack',
- gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'),
- gearman_client_ssl_key => hiera('gearman_client_ssl_key'),
- gearman_server_ssl_cert => hiera('gearman_server_ssl_cert'),
- gearman_server_ssl_key => hiera('gearman_server_ssl_key'),
- gearman_ssl_ca => hiera('gearman_ssl_ca'),
- proxy_ssl_cert_file_contents => hiera('zuul_ssl_cert_file_contents'),
- proxy_ssl_key_file_contents => hiera('zuul_ssl_key_file_contents'),
- statsd_host => 'graphite.openstack.org',
- }
-
- file { "/etc/zuul/github.key":
- ensure => present,
- owner => 'zuul',
- group => 'zuul',
- mode => '0600',
- content => hiera('zuul_github_app_key'),
- require => File['/etc/zuul'],
- }
-
- class { '::zuul::scheduler':
- layout_dir => $::project_config::zuul_layout_dir,
- require => $::project_config::config_dir,
- python_version => 3,
- use_mysql => true,
- }
-
- class { '::zuul::web': }
- class { '::zuul::fingergw': }
-
- include bup
- bup::site { 'rax.ord':
- backup_user => 'bup-zuulv3',
- backup_server => 'backup01.ord.rax.ci.openstack.org',
- }
-
-}
-
# Node-OS: xenial
node /^zuul\d+\.openstack\.org$/ {
$group = "zuul-scheduler"
diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml
index 61caeb1353..4d2b49b893 100644
--- a/playbooks/remote_puppet_else.yaml
+++ b/playbooks/remote_puppet_else.yaml
@@ -1,4 +1,4 @@
-- hosts: '!review.openstack.org:!git0*:!zuulv3*:!zuul-scheduler:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
+- hosts: '!review.openstack.org:!git0*:!zuul-scheduler:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
strategy: free
gather_facts: true
roles:
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index e6bc4dd57f..fb25743e65 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -29,7 +29,7 @@
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
vars:
puppet_timeout: 60m
-- hosts: "zuulv3.openstack.org:zuul-scheduler:!disabled"
+- hosts: "zuul-scheduler:!disabled"
strategy: free
gather_facts: true
roles: