From 97659b755b838f376988914cc6e299e06636f84b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 26 Apr 2022 09:42:30 -0700 Subject: [PATCH] resultsdb / staging: point stg proxies to ocp4 resultsdb Signed-off-by: Kevin Fenzi --- playbooks/include/proxies-reverseproxy.yml | 25 ++++++++++++++++++++++ playbooks/include/proxies-websites.yml | 9 ++++++++ 2 files changed, 34 insertions(+) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 7f1a3a0707..1884cbf986 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -559,6 +559,31 @@ http_not_https_yes_this_is_insecure_and_i_feel_bad: true when: env == "staging" + ### staging entries for resultsdb and resultsdb_frontend + - role: httpd/reverseproxy + website: resultsdb.stg.fedoraproject.org + destname: resultsdb-resultsdb + localpath: / + remotepath: /web + balancer_name: resultsdb-stg + targettype: openshift + ocp4: true + balancer_members: "{{ ocp_nodes_stg }}" + keephost: true + when: env == "staging" + + - role: httpd/reverseproxy + website: resultsdb.stg.fedoraproject.org + destname: resultsdb-resultsdbapi + localpath: /api + remotepath: /api + balancer_name: resultsdb-stg + targettype: openshift + ocp4: true + balancer_members: "{{ ocp_nodes_stg }}" + 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 diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index d82a48ee5f..7d3d12253d 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -802,6 +802,15 @@ cert_name: "{{wildcard_cert_name}}" when: env == "staging" + - role: httpd/website + site_name: resultsdb.stg.fedoraproject.org + server_aliases: [resultsdb.stg.fedoraproject.org] + # Set this explicitly to stg here.. as per the original puppet config. + SSLCertificateChainFile: wildcard-2022.stg.fedoraproject.org.intermediate.cert + sslonly: true + cert_name: "{{wildcard_cert_name}}" + when: env == "staging" + - role: httpd/website site_name: lists.fedoraproject.org server_aliases: [lists.stg.fedoraproject.org]