From e47de667d5f7ce854892756a81971fec7c4958f8 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 28 Feb 2020 07:10:26 +0100
Subject: [PATCH] Kill qa.o.o
This site was never used nor published, it can be killed according to QA
PTL.
codesearch returns no matches for it in any docs.
Keep the occurence in manifests/static.pp, this will get deleted
as part of https://review.opendev.org/710388.
Change-Id: I3c0d3b567a3eccb959dc903f169197e4581f1e13
---
playbooks/host_vars/static01.opendev.org.yaml | 2 --
.../handlers/main.yaml | 3 --
.../static/files/50-qa.openstack.org.conf | 31 -------------------
playbooks/roles/static/tasks/main.yaml | 1 -
testinfra/test_static.py | 1 -
5 files changed, 38 deletions(-)
delete mode 100644 playbooks/roles/static/files/50-qa.openstack.org.conf
diff --git a/playbooks/host_vars/static01.opendev.org.yaml b/playbooks/host_vars/static01.opendev.org.yaml
index 23bbe0996b..e38301579f 100644
--- a/playbooks/host_vars/static01.opendev.org.yaml
+++ b/playbooks/host_vars/static01.opendev.org.yaml
@@ -38,8 +38,6 @@ letsencrypt_certs:
- keystone.openstack.org
static01-nova-openstack-org:
- nova.openstack.org
- static01-qa-openstack-org:
- - qa.openstack.org
static01-service-types-openstack-org:
- service-types.openstack.org
static01-security-openstack-org:
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index ce67b9f2b3..971ae3f185 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -86,9 +86,6 @@
- name: letsencrypt updated static01-nova-openstack-org
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-- name: letsencrypt updated static01-qa-openstack-org
- include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-
- name: letsencrypt updated static01-service-types-openstack-org
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
diff --git a/playbooks/roles/static/files/50-qa.openstack.org.conf b/playbooks/roles/static/files/50-qa.openstack.org.conf
deleted file mode 100644
index 7f51162d6d..0000000000
--- a/playbooks/roles/static/files/50-qa.openstack.org.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-<VirtualHost *:80>
- ServerName qa.openstack.org
-
- RewriteEngine On
- RewriteRule ^/(.*) https://docs.openstack.org/ [last,redirect=permanent]
-
- LogLevel warn
- ErrorLog /var/log/apache2/qa.openstack.org_error.log
- CustomLog /var/log/apache2/qa.openstack.org_access.log combined
- ServerSignature Off
-</VirtualHost>
-
-<VirtualHost *:443>
- ServerName qa.openstack.org
-
- SSLCertificateFile /etc/letsencrypt-certs/qa.openstack.org/qa.openstack.org.cer
- SSLCertificateKeyFile /etc/letsencrypt-certs/qa.openstack.org/qa.openstack.org.key
- SSLCertificateChainFile /etc/letsencrypt-certs/qa.openstack.org/ca.cer
- SSLProtocol All -SSLv2 -SSLv3
- # Note: this list should ensure ciphers that provide forward secrecy
- SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP
- SSLHonorCipherOrder on
-
- RewriteEngine On
- RewriteRule ^/(.*) https://docs.openstack.org/ [last,redirect=permanent]
-
- LogLevel warn
- ErrorLog /var/log/apache2/qa.openstack.org_error.log
- CustomLog /var/log/apache2/qa.openstack.org_access.log combined
- ServerSignature Off
-</VirtualHost>
diff --git a/playbooks/roles/static/tasks/main.yaml b/playbooks/roles/static/tasks/main.yaml
index 63fdac4719..d85e56b38e 100644
--- a/playbooks/roles/static/tasks/main.yaml
+++ b/playbooks/roles/static/tasks/main.yaml
@@ -77,7 +77,6 @@
- 50-horizon.openstack.org
- 50-keystone.openstack.org
- 50-nova.openstack.org
- - 50-qa.openstack.org
- 50-security.openstack.org
- 50-service-types.openstack.org
- 50-specs.openstack.org
diff --git a/testinfra/test_static.py b/testinfra/test_static.py
index 05745ddbca..194c36fa52 100644
--- a/testinfra/test_static.py
+++ b/testinfra/test_static.py
@@ -165,7 +165,6 @@ doc_redirects = (
('horizon.openstack.org', 'https://docs.openstack.org/horizon/latest'),
('keystone.openstack.org', 'https://docs.openstack.org/keystone/latest'),
('nova.openstack.org', 'https://docs.openstack.org/nova/latest'),
- ('qa.openstack.org', 'https://docs.openstack.org/'),
('swift.openstack.org', 'https://docs.openstack.org/swift/latest'),
)