resultsdb: fix a few more things in stg and prep for prod

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

playbooks/include/proxies-redirects.yml

@@ -886,3 +886,18 @@
     website: qa.fedoraproject.org
     path: /
     target: https://fedoraproject.org/wiki/QA
+
+    #  - role: httpd/redirectmatch
+    #shortname: taskotron
+    #website: taskotron.fedoraproject.org
+    #regex: ^(.*)
+    #target: https://resultsdb.fedoraproject.org/$1
+    #when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: taskotron-stg
+    website: taskotron.stg.fedoraproject.org
+    regex: ^(.*)
+    target: https://resultsdb.stg.fedoraproject.org/$1
+    when: env == 'staging'
+

playbooks/include/proxies-reverseproxy.yml

@@ -594,8 +594,8 @@
     proxyurl: http://log01
     tags: data-analysis
 
-  ### entries for resultsdb and resultsdb_frontend
+  ## entries for resultsdb and resultsdb_frontend
-  - role: httpd/reverseproxy
+    - role: httpd/reverseproxy
     website: taskotron.fedoraproject.org
     destname: taskotron-resultsdb
     localpath: /resultsdb
@@ -603,7 +603,7 @@
     balancer_name: resultsdb
     balancer_members: ['resultsdb01.vpn.fedoraproject.org:80']
     http_not_https_yes_this_is_insecure_and_i_feel_bad: true
-
+  
   - role: httpd/reverseproxy
     website: taskotron.fedoraproject.org
     destname: taskotron-resultsdbapi
@@ -614,25 +614,25 @@
     http_not_https_yes_this_is_insecure_and_i_feel_bad: true
 
   ### staging entries for resultsdb and resultsdb_frontend
-  - role: httpd/reverseproxy
+  #  - role: httpd/reverseproxy
-    website: taskotron.stg.fedoraproject.org
+  #  website: taskotron.stg.fedoraproject.org
-    destname: taskotron-resultsdb
+  #  destname: taskotron-resultsdb
-    localpath: /resultsdb
+  #  localpath: /resultsdb
-    remotepath: /resultsdb
+  #  remotepath: /resultsdb
-    balancer_name: resultsdb-stg
+  #  balancer_name: resultsdb-stg
-    balancer_members: ['resultsdb01.stg.iad2.fedoraproject.org:80']
+  #  balancer_members: ['resultsdb01.stg.iad2.fedoraproject.org:80']
-    http_not_https_yes_this_is_insecure_and_i_feel_bad: true
+  #  http_not_https_yes_this_is_insecure_and_i_feel_bad: true
-    when: env == "staging"
+  #  when: env == "staging"
-
+  #
-  - role: httpd/reverseproxy
+  #- role: httpd/reverseproxy
-    website: taskotron.stg.fedoraproject.org
+  #  website: taskotron.stg.fedoraproject.org
-    destname: taskotron-resultsdbapi
+  #  destname: taskotron-resultsdbapi
-    localpath: /resultsdb_api
+  #  localpath: /resultsdb_api
-    remotepath: /resultsdb_api
+  #  remotepath: /resultsdb_api
-    balancer_name: resultsdb-stg
+  #  balancer_name: resultsdb-stg
-    balancer_members: ['resultsdb01.stg.iad2.fedoraproject.org:80']
+  #  balancer_members: ['resultsdb01.stg.iad2.fedoraproject.org:80']
-    http_not_https_yes_this_is_insecure_and_i_feel_bad: true
+  #  http_not_https_yes_this_is_insecure_and_i_feel_bad: true
-    when: env == "staging"
+  #  when: env == "staging"
 
   ### staging entries for resultsdb and resultsdb_frontend
   - role: httpd/reverseproxy
@@ -647,6 +647,19 @@
     keephost: true
     when: env == "staging"
 
+  ### production entries for resultsdb and resultsdb_frontend
+  - role: httpd/reverseproxy
+    website: resultsdb.fedoraproject.org
+    destname: zz-resultsdb-resultsdb
+    localpath: /
+    remotepath: /
+    balancer_name: resultsdb
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
+    targettype: openshift
+    ocp4: true
+    keephost: true
+    when: env != "staging"
+
   # This one gets its own role (instead of httpd/reverseproxy) so that it can
   # copy in some silly static resources (globe.png, index.html)
   - role: geoip-city-wsgi/proxy

playbooks/openshift-apps/resultsdb-ci-listener.yml

@@ -1,6 +1,5 @@
 - name: make the app be real
-  # hosts: os_masters[0]:os_masters_stg[0]
+  hosts: os_control_stg[0]
-  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
@@ -57,4 +56,4 @@
     - role: openshift/object
       app: resultsdb-ci-listener
       template: deploymentconfigs.yml
-      objectname: deploymentconfigs.yml
+      objectname: deploymentconfigs.yml