diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index ac7db295c1..240206f666 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -182,6 +182,7 @@ website: "accounts{{ env_suffix }}.fedoraproject.org" destname: noggin balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" targettype: openshift keephost: true ocp4: true @@ -192,6 +193,7 @@ website: "fasjson{{ env_suffix }}.fedoraproject.org" destname: fasjson balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" targettype: openshift keephost: true ocp4: true @@ -296,6 +298,7 @@ website: qa.fedoraproject.org destname: blockerbugs balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" targettype: openshift keephost: true ocp4: true @@ -308,6 +311,7 @@ website: qa.fedoraproject.org destname: blockerbugs balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" targettype: openshift keephost: true ocp4: true @@ -328,6 +332,7 @@ website: bodhi.fedoraproject.org destname: bodhi balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" targettype: openshift keephost: true ocp4: true @@ -352,6 +357,7 @@ website: "updates.coreos{{ env_suffix }}.fedoraproject.org" destname: cincinnati balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" ocp4: true targettype: openshift keephost: true @@ -363,6 +369,7 @@ website: "status.updates.coreos{{ env_suffix }}.fedoraproject.org" destname: cincinnati balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" ocp4: true targettype: openshift keephost: true @@ -374,6 +381,7 @@ website: "raw-updates.coreos{{ env_suffix }}.fedoraproject.org" destname: cincinnati balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" ocp4: true targettype: openshift keephost: true @@ -385,6 +393,7 @@ website: "status.raw-updates.coreos{{ env_suffix }}.fedoraproject.org" destname: cincinnati balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" ocp4: true targettype: openshift keephost: true @@ -396,6 +405,7 @@ website: "updates.coreos{{ env_suffix }}.fedoraproject.org" destname: cincinnati balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" ocp4: true targettype: openshift keephost: true @@ -407,6 +417,7 @@ website: "status.updates.coreos{{ env_suffix }}.fedoraproject.org" destname: cincinnati balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" ocp4: true targettype: openshift keephost: true @@ -418,6 +429,7 @@ website: "raw-updates.coreos{{ env_suffix }}.fedoraproject.org" destname: cincinnati balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" ocp4: true targettype: openshift keephost: true @@ -429,6 +441,7 @@ website: "status.raw-updates.coreos{{ env_suffix }}.fedoraproject.org" destname: cincinnati balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" ocp4: true targettype: openshift keephost: true diff --git a/roles/httpd/reverseproxy/tasks/main.yml b/roles/httpd/reverseproxy/tasks/main.yml index d3e1324034..85956742e8 100644 --- a/roles/httpd/reverseproxy/tasks/main.yml +++ b/roles/httpd/reverseproxy/tasks/main.yml @@ -7,42 +7,6 @@ # - keephost # - proxyopts -- name: Set OpenShift information if not preconfigured (prod) - set_fact: - balancer_members: "{{ openshift_nodes }}" - when: 'targettype == "openshift" and balancer_members is not defined and env != "staging" ' - tags: - - httpd - - httpd/reverseproxy - - httpd/reversepassproxy - -- name: Set OpenShift4 information if not preconfigured (prod) - set_fact: - balancer_members: "{{ ocp_nodes }}" - when: 'targettype == "openshift" and ocp4|bool and balancer_members is not defined and env != "staging" ' - tags: - - httpd - - httpd/reverseproxy - - httpd/reversepassproxy - -- name: Set OpenShift information if not preconfigured (stg) - set_fact: - balancer_members: "{{ openshift_nodes_stg }}" - when: 'targettype == "openshift" and balancer_members is not defined and env == "staging" ' - tags: - - httpd - - httpd/reverseproxy - - httpd/reversepassproxy - -- name: Set OpenShift4 information if not preconfigured (stg) - set_fact: - balancer_members: "{{ ocp_nodes_stg }}" - when: 'targettype == "openshift" and ocp4|bool and balancer_members is not defined and env == "staging" ' - tags: - - httpd - - httpd/reverseproxy - - httpd/reversepassproxy - - name: Copy in ProxyPassReverse for {{destname}} ({{website}}{{remotepath}}) template: > src={{item}} @@ -59,7 +23,3 @@ - httpd - httpd/reverseproxy - httpd/reversepassproxy - -- name: clear balancer_members - set_fact: - balancer_members: !!null