From a0abcb06c188c8de10804530b25aa70ecc4828ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Tue, 19 Feb 2019 11:15:54 +0100 Subject: [PATCH] the-new-hotness: Fix external service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Konečný --- playbooks/openshift-apps/the-new-hotness.yml | 3 +++ roles/openshift-apps/the-new-hotness/files/endpoints.yml | 2 +- roles/openshift-apps/the-new-hotness/files/service.yml | 2 +- roles/openshift-apps/the-new-hotness/templates/configmap.yml | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml index 37b302a5c4..53faf21afc 100644 --- a/playbooks/openshift-apps/the-new-hotness.yml +++ b/playbooks/openshift-apps/the-new-hotness.yml @@ -64,6 +64,8 @@ file: deploymentconfig.yml objectname: deploymentconfig.yml +# Fix for connecting to internal bugzilla +{% if env == "staging" %} - role: openshift/object app: the-new-hotness file: service.yml @@ -73,6 +75,7 @@ app: the-new-hotness file: endpoints.yml objectname: endpoints.yml +{% endif %} - role: openshift/rollout app: the-new-hotness diff --git a/roles/openshift-apps/the-new-hotness/files/endpoints.yml b/roles/openshift-apps/the-new-hotness/files/endpoints.yml index 240551ea35..a388961d85 100644 --- a/roles/openshift-apps/the-new-hotness/files/endpoints.yml +++ b/roles/openshift-apps/the-new-hotness/files/endpoints.yml @@ -7,4 +7,4 @@ subsets: - ip: 209.132.183.72 ports: - port: 443 - name: partner-bugzilla.redhat.com + name: partner-bugzilla diff --git a/roles/openshift-apps/the-new-hotness/files/service.yml b/roles/openshift-apps/the-new-hotness/files/service.yml index fb1b1250d6..df3ca7f333 100644 --- a/roles/openshift-apps/the-new-hotness/files/service.yml +++ b/roles/openshift-apps/the-new-hotness/files/service.yml @@ -4,7 +4,7 @@ metadata: name: partner-bugzilla spec: ports: - - name: partner-bugzilla.redhat.com + - name: partner-bugzilla port: 443 selector: {} diff --git a/roles/openshift-apps/the-new-hotness/templates/configmap.yml b/roles/openshift-apps/the-new-hotness/templates/configmap.yml index de6bffa888..f7d383634d 100644 --- a/roles/openshift-apps/the-new-hotness/templates/configmap.yml +++ b/roles/openshift-apps/the-new-hotness/templates/configmap.yml @@ -102,7 +102,6 @@ items: user = "{{ upstream_release_bugzilla_user }}" password = "{{ upstream_release_bugzilla_password }}" api_key = "" - # Bugzilla URL url = "https://partner-bugzilla.redhat.com" explanation_url = "https://stg.fedoraproject.org/wiki/Upstream_release_monitoring" {% else %}