Default to ocp4, clean up some last few apps

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

inventory/group_vars/all

@@ -189,8 +189,8 @@ nrpe_procs_crit: 300
 # by default the number of procs we allow before we whine
 nrpe_procs_warn: 250
 num_cpus: 2
-# ocp4 is only set true in some proxy roles
-ocp4: false
+# ocp4 is default now in some proxy roles
+ocp4: true
 # All the ocp production workers.
 # This is used by the openvpn openshift app to make sure there's a vpn pod on each node.
 ocp_nodes:

playbooks/include/proxies-reverseproxy.yml

@@ -270,29 +270,29 @@
     proxyurl: "{{ varnish_url }}"
     when: env != "staging"
 
-  - role: httpd/reverseproxy
-    website: apps.fedoraproject.org
-    destname: kerneltest
-    remotepath: /kerneltest
-    localpath: /kerneltest
-    balancer_name: app-os
-    targettype: openshift
-    balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
-    ocp4: false
-    keephost: true
-    when: env == "staging"
-
-  - role: httpd/reverseproxy
-    website: kerneltest.fedoraproject.org
-    destname: kerneltest
-    balancer_name: app-os
-    targettype: openshift
-    balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
-    ocp4: false
-    keephost: true
-    tags: kerneltest
-    header_scheme: true
-    when: env == "staging"
+    #  - role: httpd/reverseproxy
+    #    website: apps.fedoraproject.org
+    # destname: kerneltest
+    #remotepath: /kerneltest
+    #localpath: /kerneltest
+    #balancer_name: app-os
+    #targettype: openshift
+    #balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
+    #ocp4: false
+    #keephost: true
+    #when: env == "staging"
+    #
+    #  - role: httpd/reverseproxy
+    #website: kerneltest.fedoraproject.org
+    #destname: kerneltest
+    #balancer_name: app-os
+    #targettype: openshift
+    #balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
+    #ocp4: false
+    #keephost: true
+    #tags: kerneltest
+    #header_scheme: true
+    #when: env == "staging"
 
   - role: httpd/reverseproxy
     website: qa.fedoraproject.org
@@ -512,9 +512,9 @@
     website: message-tagging-service.fedoraproject.org
     destname: message-tagging-service
     balancer_name: app-os
-    balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
     targettype: openshift
-    ocp4: false
+    ocp4: true
     keephost: true
     tags: message-tagging-service
 
@@ -906,15 +906,15 @@
     keephost: true
     tags: mdapi
 
-  - role: httpd/reverseproxy
-    website: wallpapers.fedoraproject.org
-    destname: wallpapers
-    balancer_name: app-os
-    balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
-    targettype: openshift
-    ocp4: false
-    keephost: true
-    tags: wallpapers
+    #  - role: httpd/reverseproxy
+    #website: wallpapers.fedoraproject.org
+    #destname: wallpapers
+    #balancer_name: app-os
+    #balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
+    #targettype: openshift
+    #ocp4: false
+    #keephost: true
+    #tags: wallpapers
 
   - role: httpd/reverseproxy
     website: silverblue.fedoraproject.org