os.fedoraproject.org / app.os.fedoraproject.org: remove more old openshift 3.11 cluster stuff

It may be that having this on some of the proxies is causing problems
because it's trying to ping the old openshift 3.11 cluster and filling
up apache slots with it. We do not need this stuff anymore, so remove
it.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

playbooks/check-for-updates.yml

@@ -9,7 +9,7 @@
 #
 
 - name: check for updates
-  hosts: distro_RedHat:distro_CentOS:!*.app.os.fedoraproject.org:!*.app.os.stg.fedoraproject.org
+  hosts: distro_RedHat:distro_CentOS:!ocp*:!worker*
   gather_facts: false
 
   tasks:
@@ -22,7 +22,7 @@
     when: yumoutput.results|length > 0
 
 - name: check for updates
-  hosts: distro_Fedora:!*.app.os.fedoraproject.org:!*.app.os.stg.fedoraproject.org
+  hosts: distro_Fedora:!ocp*:!worker*
   gather_facts: false
 
   tasks:

playbooks/include/proxies-certificates.yml

@@ -37,13 +37,6 @@
     SSLCertificateChainFile: wildcard-2022.stg.fedoraproject.org.intermediate.cert
     when: env == "staging"
 
-  - role: httpd/certificate
-    certname: wildcard-2022.app.os.stg.fedoraproject.org
-    SSLCertificateChainFile: wildcard-2022.app.os.stg.fedoraproject.org.intermediate.cert
-    when: env == "staging"
-    tags:
-    - app.os.stg.fedoraproject.org
-
   - role: httpd/certificate
     certname: wildcard-2022.apps.ocp.stg.fedoraproject.org
     SSLCertificateChainFile: wildcard-2022.apps.ocp.stg.fedoraproject.org.intermediate.cert
@@ -51,12 +44,6 @@
     tags:
     - apps.ocp.stg.fedoraproject.org
 
-  - role: httpd/certificate
-    certname: wildcard-2022.app.os.fedoraproject.org
-    SSLCertificateChainFile: wildcard-2022.app.os.fedoraproject.org.intermediate.cert
-    tags:
-    - app.os.fedoraproject.org
-
   - role: httpd/certificate
     certname: wildcard-2022.apps.ocp.fedoraproject.org
     SSLCertificateChainFile: wildcard-2022.apps.ocp.fedoraproject.org.intermediate.cert

playbooks/include/proxies-websites.yml

@@ -658,50 +658,6 @@
     tags:
     - zezere
 
-  - role: httpd/website
-    site_name: os.fedoraproject.org
-    sslonly: true
-    cert_name: "{{wildcard_cert_name}}"
-    # The Connection and Upgrade headers don't work for h2
-    # So non-h2 is needed to fix websockets.
-    use_h2: false
-    tags:
-    - os.fedoraproject.org
-
-  - role: httpd/website
-    site_name: app.os.fedoraproject.org
-    server_aliases: ["*.app.os.fedoraproject.org"]
-    sslonly: true
-    cert_name: "{{os_wildcard_cert_name}}"
-    SSLCertificateChainFile: "{{os_wildcard_int_file}}"
-    # The Connection and Upgrade headers don't work for h2
-    # So non-h2 is needed to fix websockets.
-    use_h2: false
-    tags:
-    - app.os.fedoraproject.org
-
-  - role: httpd/website
-    site_name: os.stg.fedoraproject.org
-    sslonly: true
-    cert_name: "{{wildcard_cert_name}}"
-    # The Connection and Upgrade headers don't work for h2
-    # So non-h2 is needed to fix websockets.
-    use_h2: false
-    tags:
-    - os.stg.fedoraproject.org
-
-  - role: httpd/website
-    site_name: app.os.stg.fedoraproject.org
-    server_aliases: ["*.app.os.stg.fedoraproject.org"]
-    sslonly: true
-    cert_name: "{{os_wildcard_cert_name}}"
-    SSLCertificateChainFile: "{{os_wildcard_int_file}}"
-    # The Connection and Upgrade headers don't work for h2
-    # So non-h2 is needed to fix websockets.
-    use_h2: false
-    tags:
-    - app.os.stg.fedoraproject.org
-
   - role: httpd/website
     site_name: ocp.stg.fedoraproject.org
     sslonly: true

playbooks/openshift-apps/noggin-centos.yml

@@ -86,7 +86,6 @@
     app: noggin-centos
     routename: noggin
     host: "accounts{{ env_suffix }}.centos.org"
-    # host: "aco.app.os{{ env_suffix }}.fedoraproject.org"
     serviceport: web
     servicename: noggin-web
     annotations:

playbooks/openshift-apps/test-auth.yml

@@ -50,7 +50,7 @@
     - role: openshift/route
       app: test-auth
       routename: test-auth
-      host: "test-auth.app.os{{ env_suffix }}.fedoraproject.org"
+      host: "test-auth.apps.ocp{{ env_suffix }}.fedoraproject.org"
       serviceport: web
       servicename: test-auth
       annotations: