From 483f9802ac3c17c08490650758ea7e9f264fccd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Tue, 3 Dec 2024 11:26:36 +0100 Subject: [PATCH] s/route_routename/route_name/g MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- playbooks/openshift-apps/asknot.yml | 4 ++-- playbooks/openshift-apps/badges.yml | 4 ++-- playbooks/openshift-apps/blockerbugs.yml | 4 ++-- playbooks/openshift-apps/bodhi.yml | 2 +- playbooks/openshift-apps/coreos-cincinnati.yml | 8 ++++---- playbooks/openshift-apps/datagrepper.yml | 2 +- playbooks/openshift-apps/discourse2fedmsg.yml | 2 +- playbooks/openshift-apps/easyfix.yml | 2 +- playbooks/openshift-apps/elections.yml | 2 +- playbooks/openshift-apps/fasjson.yml | 2 +- playbooks/openshift-apps/fedocal.yml | 2 +- playbooks/openshift-apps/fedora-packages-static.yml | 2 +- playbooks/openshift-apps/flask-oidc-dev.yml | 4 ++-- playbooks/openshift-apps/fmn.yml | 6 +++--- playbooks/openshift-apps/greenwave.yml | 2 +- playbooks/openshift-apps/ipsilon-website.yml | 4 ++-- playbooks/openshift-apps/kanban.yml | 2 +- playbooks/openshift-apps/kerneltest.yml | 2 +- playbooks/openshift-apps/koschei.yml | 2 +- playbooks/openshift-apps/languages.yml | 2 +- playbooks/openshift-apps/maubot.yml | 2 +- playbooks/openshift-apps/mdapi.yml | 2 +- playbooks/openshift-apps/mirrormanager.yml | 4 ++-- playbooks/openshift-apps/mote.yml | 2 +- playbooks/openshift-apps/noggin-centos.yml | 2 +- playbooks/openshift-apps/noggin.yml | 2 +- playbooks/openshift-apps/oraculum.yml | 8 ++++---- playbooks/openshift-apps/planet.yml | 4 ++-- playbooks/openshift-apps/resultsdb.yml | 4 ++-- playbooks/openshift-apps/test-auth.yml | 4 ++-- playbooks/openshift-apps/testdays.yml | 2 +- playbooks/openshift-apps/transtats.yml | 2 +- playbooks/openshift-apps/waiverdb.yml | 2 +- playbooks/openshift-apps/webhook2fedmsg.yml | 4 ++-- playbooks/openshift-apps/zezere.yml | 2 +- roles/openshift/route/tasks/main.yml | 4 ++-- roles/openshift/route/templates/route.yml | 2 +- 37 files changed, 56 insertions(+), 56 deletions(-) diff --git a/playbooks/openshift-apps/asknot.yml b/playbooks/openshift-apps/asknot.yml index 04f7d4699b..ac0d3aceb6 100644 --- a/playbooks/openshift-apps/asknot.yml +++ b/playbooks/openshift-apps/asknot.yml @@ -39,7 +39,7 @@ - role: openshift/route route_app: asknot - route_routename: asknot + route_name: asknot route_host: "stg.whatcanidoforfedora.org" route_serviceport: 8080-tcp route_servicename: asknot @@ -47,7 +47,7 @@ - role: openshift/route route_app: asknot - route_routename: asknot + route_name: asknot route_host: "whatcanidoforfedora.org" route_serviceport: 8080-tcp route_servicename: asknot diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml index 66a0de5272..09fff68ec5 100644 --- a/playbooks/openshift-apps/badges.yml +++ b/playbooks/openshift-apps/badges.yml @@ -126,7 +126,7 @@ # Routes - role: openshift/route route_app: badges - route_routename: frontend + route_name: frontend route_host: "badges{{ env_suffix }}.fedoraproject.org" route_servicename: frontend route_serviceport: web @@ -134,7 +134,7 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/route route_app: badges - route_routename: frontend-openshift + route_name: frontend-openshift route_host: "badges.apps.ocp{{ env_suffix }}.fedoraproject.org" route_servicename: frontend route_serviceport: web diff --git a/playbooks/openshift-apps/blockerbugs.yml b/playbooks/openshift-apps/blockerbugs.yml index 8ccece2847..eabfd629a1 100644 --- a/playbooks/openshift-apps/blockerbugs.yml +++ b/playbooks/openshift-apps/blockerbugs.yml @@ -118,7 +118,7 @@ - role: openshift/route route_app: blockerbugs - route_routename: blockerbugs + route_name: blockerbugs route_host: "qa{{ env_suffix }}.fedoraproject.org" route_path: "/blockerbugs" route_serviceport: 8080-tcp @@ -126,7 +126,7 @@ - role: openshift/route route_app: blockerbugs - route_routename: qa-landing + route_name: qa-landing route_host: "qa{{ env_suffix }}.fedoraproject.org" route_serviceport: 8080-tcp route_servicename: qa-landing diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index 46bf8f625f..95ebde9dba 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -128,7 +128,7 @@ when: env != "production" - role: openshift/route route_app: bodhi - route_routename: bodhi-web + route_name: bodhi-web route_host: "bodhi{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: bodhi-web diff --git a/playbooks/openshift-apps/coreos-cincinnati.yml b/playbooks/openshift-apps/coreos-cincinnati.yml index 28397da070..b8205067cf 100644 --- a/playbooks/openshift-apps/coreos-cincinnati.yml +++ b/playbooks/openshift-apps/coreos-cincinnati.yml @@ -71,28 +71,28 @@ - role: openshift/route route_app: coreos-cincinnati - route_routename: coreos-updates + route_name: coreos-updates route_host: "updates.coreos{{ env_suffix }}.fedoraproject.org" route_serviceport: coreos-cincinnati-updates route_servicename: coreos-cincinnati - role: openshift/route route_app: coreos-cincinnati - route_routename: coreos-updates-status + route_name: coreos-updates-status route_host: "status.updates.coreos{{ env_suffix }}.fedoraproject.org" route_serviceport: coreos-cincinnati-updates-status route_servicename: coreos-cincinnati - role: openshift/route route_app: coreos-cincinnati - route_routename: coreos-updates-raw + route_name: coreos-updates-raw route_host: "raw-updates.coreos{{ env_suffix }}.fedoraproject.org" route_serviceport: coreos-cincinnati-raw-updates route_servicename: coreos-cincinnati - role: openshift/route route_app: coreos-cincinnati - route_routename: coreos-updates-raw-status + route_name: coreos-updates-raw-status route_host: "status.raw-updates.coreos{{ env_suffix }}.fedoraproject.org" route_serviceport: coreos-cincinnati-raw-updates-status route_servicename: coreos-cincinnati diff --git a/playbooks/openshift-apps/datagrepper.yml b/playbooks/openshift-apps/datagrepper.yml index a472c764d6..92d733ff8b 100644 --- a/playbooks/openshift-apps/datagrepper.yml +++ b/playbooks/openshift-apps/datagrepper.yml @@ -82,7 +82,7 @@ - role: openshift/route route_app: datagrepper - route_routename: datagrepper + route_name: datagrepper route_host: "apps{{ env_suffix }}.fedoraproject.org" route_path: "/datagrepper" route_serviceport: web diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index 9b66243d3a..13579a0775 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -61,7 +61,7 @@ - role: openshift/route route_app: discourse2fedmsg - route_routename: discourse2fedmsg + route_name: discourse2fedmsg route_host: "discourse2fedmsg{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: discourse2fedmsg-web diff --git a/playbooks/openshift-apps/easyfix.yml b/playbooks/openshift-apps/easyfix.yml index 57aaff03df..cd87cc5d6d 100644 --- a/playbooks/openshift-apps/easyfix.yml +++ b/playbooks/openshift-apps/easyfix.yml @@ -52,7 +52,7 @@ # Routes - role: openshift/route route_app: easyfix - route_routename: web + route_name: web route_host: "easyfix.apps.ocp{{ env_suffix }}.fedoraproject.org" route_servicename: web route_serviceport: web diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index fa05d8cbf1..744d4876cb 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -104,7 +104,7 @@ - role: openshift/route route_app: elections - route_routename: elections + route_name: elections route_host: "elections{{ env_suffix }}.fedoraproject.org" route_serviceport: 8000-tcp route_servicename: elections diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml index eb82b2d563..8d7bcf06c2 100644 --- a/playbooks/openshift-apps/fasjson.yml +++ b/playbooks/openshift-apps/fasjson.yml @@ -93,7 +93,7 @@ - role: openshift/route route_app: fasjson - route_routename: fasjson + route_name: fasjson route_host: "fasjson{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: fasjson-web diff --git a/playbooks/openshift-apps/fedocal.yml b/playbooks/openshift-apps/fedocal.yml index 09c80dc3af..f88df37136 100644 --- a/playbooks/openshift-apps/fedocal.yml +++ b/playbooks/openshift-apps/fedocal.yml @@ -70,7 +70,7 @@ - role: openshift/route route_app: fedocal - route_routename: fedocal + route_name: fedocal route_host: "calendar{{ env_suffix }}.fedoraproject.org" route_serviceport: 8080-tcp route_servicename: fedocal diff --git a/playbooks/openshift-apps/fedora-packages-static.yml b/playbooks/openshift-apps/fedora-packages-static.yml index 4e5b00f06a..138f9f765b 100644 --- a/playbooks/openshift-apps/fedora-packages-static.yml +++ b/playbooks/openshift-apps/fedora-packages-static.yml @@ -49,7 +49,7 @@ - role: openshift/route route_app: fedora-packages-static - route_routename: fedora-packages-static + route_name: fedora-packages-static route_host: "packages{{ env_suffix }}.fedoraproject.org" route_serviceport: 8080-tcp route_servicename: fedora-packages-static diff --git a/playbooks/openshift-apps/flask-oidc-dev.yml b/playbooks/openshift-apps/flask-oidc-dev.yml index 3fd6f6899f..b5c6866fc1 100644 --- a/playbooks/openshift-apps/flask-oidc-dev.yml +++ b/playbooks/openshift-apps/flask-oidc-dev.yml @@ -44,7 +44,7 @@ # - role: openshift/route # route_app: test-auth - # route_routename: test-auth + # route_name: test-auth # route_host: "admin{{ env_suffix }}.fedoraproject.org" # route_path: "/test-auth" # route_serviceport: web @@ -54,7 +54,7 @@ - role: openshift/route route_app: flask-oidc-dev - route_routename: flask-oidc-dev + route_name: flask-oidc-dev route_host: "app-flask-oidc-dev.apps.ocp{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: flask-oidc-dev diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml index 244df80aa7..e831887251 100644 --- a/playbooks/openshift-apps/fmn.yml +++ b/playbooks/openshift-apps/fmn.yml @@ -146,7 +146,7 @@ # Routes - role: openshift/route route_app: fmn - route_routename: frontend + route_name: frontend route_host: "notifications{{ env_suffix }}.fedoraproject.org" route_servicename: frontend route_serviceport: web @@ -154,7 +154,7 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/route route_app: fmn - route_routename: api + route_name: api route_host: "fmn-api.apps.ocp{{ env_suffix }}.fedoraproject.org" route_servicename: api route_serviceport: web @@ -163,7 +163,7 @@ # Sendria is an email sink for testing, to avoid sending actual emails. - role: openshift/route route_app: fmn - route_routename: sendria + route_name: sendria route_host: "fmn-email.apps.ocp{{ env_suffix }}.fedoraproject.org" route_servicename: sendria route_serviceport: web diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index ef4e4a16d3..a016d6591f 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -68,7 +68,7 @@ - role: openshift/route route_app: greenwave - route_routename: web-pretty + route_name: web-pretty route_host: "greenwave{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: greenwave-web diff --git a/playbooks/openshift-apps/ipsilon-website.yml b/playbooks/openshift-apps/ipsilon-website.yml index 8157c7611e..a194ef60d0 100644 --- a/playbooks/openshift-apps/ipsilon-website.yml +++ b/playbooks/openshift-apps/ipsilon-website.yml @@ -36,7 +36,7 @@ - role: openshift/route route_app: ipsilon-website - route_routename: web-internal + route_name: web-internal route_host: "ipsilon-website.apps.ocp{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: web @@ -45,7 +45,7 @@ - role: openshift/route route_app: ipsilon-website - route_routename: web + route_name: web route_host: "ipsilon-project.org" route_serviceport: web route_servicename: web diff --git a/playbooks/openshift-apps/kanban.yml b/playbooks/openshift-apps/kanban.yml index 4346f9b9c5..de52e33a9e 100644 --- a/playbooks/openshift-apps/kanban.yml +++ b/playbooks/openshift-apps/kanban.yml @@ -118,7 +118,7 @@ - role: openshift/route route_app: kanban - route_routename: kanban + route_name: kanban route_host: "kanban.qa{{ env_suffix }}.fedoraproject.org" route_serviceport: 8080-tcp route_servicename: kanban-web diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml index 1aafb917f4..4b5c4e1659 100644 --- a/playbooks/openshift-apps/kerneltest.yml +++ b/playbooks/openshift-apps/kerneltest.yml @@ -98,7 +98,7 @@ - role: openshift/route route_app: kerneltest - route_routename: kerneltest + route_name: kerneltest route_host: "kerneltest{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: kerneltest-web diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml index 99e50f0707..471e1a7414 100644 --- a/playbooks/openshift-apps/koschei.yml +++ b/playbooks/openshift-apps/koschei.yml @@ -32,7 +32,7 @@ - role: openshift/route route_app: "{{ app }}" - route_routename: frontend + route_name: frontend route_host: "koschei{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: frontend diff --git a/playbooks/openshift-apps/languages.yml b/playbooks/openshift-apps/languages.yml index 15e4fbdc04..55f4e62458 100644 --- a/playbooks/openshift-apps/languages.yml +++ b/playbooks/openshift-apps/languages.yml @@ -38,7 +38,7 @@ - role: openshift/route route_app: languages - route_routename: languages + route_name: languages route_host: "languages{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: web diff --git a/playbooks/openshift-apps/maubot.yml b/playbooks/openshift-apps/maubot.yml index 647b883cda..e0e0febfe1 100644 --- a/playbooks/openshift-apps/maubot.yml +++ b/playbooks/openshift-apps/maubot.yml @@ -102,7 +102,7 @@ - role: openshift/route route_app: maubot - route_routename: maubot + route_name: maubot route_host: "maubot.apps.ocp{{ env_suffix }}.fedoraproject.org" route_serviceport: maubot route_servicename: maubot diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml index d3cea2e815..a9545c90cf 100644 --- a/playbooks/openshift-apps/mdapi.yml +++ b/playbooks/openshift-apps/mdapi.yml @@ -78,7 +78,7 @@ - role: openshift/route route_app: mdapi - route_routename: mdapi + route_name: mdapi route_host: "mdapi{{env_suffix}}.fedoraproject.org" route_serviceport: 8080-tcp route_servicename: mdapi diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index d624d7f941..12d6149341 100644 --- a/playbooks/openshift-apps/mirrormanager.yml +++ b/playbooks/openshift-apps/mirrormanager.yml @@ -89,7 +89,7 @@ # Routes - role: openshift/route route_app: mirrormanager - route_routename: frontend + route_name: frontend route_host: "{{ mirrormanager_hostname }}" route_servicename: frontend route_serviceport: web @@ -98,7 +98,7 @@ - role: openshift/route route_app: mirrormanager - route_routename: frontend-openshift + route_name: frontend-openshift route_host: "mirrormanager.apps.ocp{{ env_suffix }}.fedoraproject.org" route_servicename: frontend route_serviceport: web diff --git a/playbooks/openshift-apps/mote.yml b/playbooks/openshift-apps/mote.yml index b5161f68a4..fbdf16779f 100644 --- a/playbooks/openshift-apps/mote.yml +++ b/playbooks/openshift-apps/mote.yml @@ -85,7 +85,7 @@ - role: openshift/route route_app: mote - route_routename: mote + route_name: mote route_serviceport: mote-tcp route_servicename: mote route_host: "meetbot{{ env_suffix }}.fedoraproject.org" diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index d4d47eb021..484efbdd5d 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/playbooks/openshift-apps/noggin-centos.yml @@ -81,7 +81,7 @@ - role: openshift/route route_app: noggin-centos - route_routename: noggin + route_name: noggin route_host: "accounts{{ env_suffix }}.centos.org" route_serviceport: web route_servicename: noggin-web diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index a5502c4fc4..8b16d3f775 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -78,7 +78,7 @@ - role: openshift/route route_app: noggin - route_routename: noggin + route_name: noggin route_host: "accounts{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: noggin-web diff --git a/playbooks/openshift-apps/oraculum.yml b/playbooks/openshift-apps/oraculum.yml index 04ec71c92e..d57e260731 100644 --- a/playbooks/openshift-apps/oraculum.yml +++ b/playbooks/openshift-apps/oraculum.yml @@ -85,7 +85,7 @@ - role: openshift/route route_app: oraculum - route_routename: oraculum-api + route_name: oraculum-api route_host: "packager-dashboard{{ env_suffix }}.fedoraproject.org" route_path: "/api" route_serviceport: 8080-tcp @@ -95,7 +95,7 @@ - role: openshift/route route_app: oraculum - route_routename: oraculum-oidc-callback + route_name: oraculum-oidc-callback route_host: "packager-dashboard{{ env_suffix }}.fedoraproject.org" route_path: "/oidc_callback" route_serviceport: 8080-tcp @@ -105,7 +105,7 @@ - role: openshift/route route_app: oraculum - route_routename: oraculum-flower + route_name: oraculum-flower route_host: "packager-dashboard{{ env_suffix }}.fedoraproject.org" route_path: "/_flower" route_serviceport: 8080-tcp @@ -115,7 +115,7 @@ - role: openshift/route route_app: oraculum - route_routename: oraculum-frontend + route_name: oraculum-frontend route_host: "packager-dashboard{{ env_suffix }}.fedoraproject.org" route_serviceport: 8080-tcp route_servicename: oraculum-frontend diff --git a/playbooks/openshift-apps/planet.yml b/playbooks/openshift-apps/planet.yml index b6e96ee329..c315114181 100644 --- a/playbooks/openshift-apps/planet.yml +++ b/playbooks/openshift-apps/planet.yml @@ -56,7 +56,7 @@ - role: openshift/route route_app: planet - route_routename: planet + route_name: planet route_host: "planet.apps.ocp{{env_suffix}}.fedoraproject.org" route_serviceport: web route_servicename: planet @@ -65,7 +65,7 @@ - role: openshift/route route_app: planet - route_routename: planet + route_name: planet route_host: "{{env_prefix}}fedoraplanet.org" route_serviceport: web route_servicename: planet diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index 7331380371..2c1f46e8b8 100644 --- a/playbooks/openshift-apps/resultsdb.yml +++ b/playbooks/openshift-apps/resultsdb.yml @@ -101,7 +101,7 @@ - role: openshift/route route_app: resultsdb - route_routename: resultsdb-api + route_name: resultsdb-api route_host: "resultsdb{{ env_suffix }}.fedoraproject.org" route_serviceport: api route_servicename: resultsdb-api @@ -130,7 +130,7 @@ - role: openshift/route route_app: resultsdb - route_routename: resultsdb-web + route_name: resultsdb-web route_host: "resultsdb{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: resultsdb-frontend diff --git a/playbooks/openshift-apps/test-auth.yml b/playbooks/openshift-apps/test-auth.yml index c3bf14c236..0662024741 100644 --- a/playbooks/openshift-apps/test-auth.yml +++ b/playbooks/openshift-apps/test-auth.yml @@ -41,7 +41,7 @@ # - role: openshift/route # route_app: test-auth - # route_routename: test-auth + # route_name: test-auth # route_host: "admin{{ env_suffix }}.fedoraproject.org" # route_path: "/test-auth" # route_serviceport: web @@ -50,7 +50,7 @@ # haproxy.router.openshift.io/timeout: 5m - role: openshift/route route_app: test-auth - route_routename: test-auth + route_name: test-auth route_host: "test-auth.apps.ocp{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: test-auth diff --git a/playbooks/openshift-apps/testdays.yml b/playbooks/openshift-apps/testdays.yml index d8f280a573..c23a6768fd 100644 --- a/playbooks/openshift-apps/testdays.yml +++ b/playbooks/openshift-apps/testdays.yml @@ -94,7 +94,7 @@ - role: openshift/route route_app: testdays - route_routename: testdays + route_name: testdays route_host: "testdays{{ env_suffix }}.fedoraproject.org" route_serviceport: 8080-tcp route_servicename: testdays diff --git a/playbooks/openshift-apps/transtats.yml b/playbooks/openshift-apps/transtats.yml index 72bdb90ce0..ff453c81be 100644 --- a/playbooks/openshift-apps/transtats.yml +++ b/playbooks/openshift-apps/transtats.yml @@ -35,7 +35,7 @@ object_objectname: service.yml - role: openshift/route route_app: transtats - route_routename: transtats-web + route_name: transtats-web route_host: transtats{{ env_suffix }}.fedoraproject.org route_serviceport: web route_servicename: transtats-web diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index c2b74e7b30..5ea131e52a 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -102,7 +102,7 @@ - role: openshift/route route_app: waiverdb - route_routename: web-pretty + route_name: web-pretty route_host: "waiverdb{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: waiverdb-web diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index 19119e1352..e4a5e3be78 100644 --- a/playbooks/openshift-apps/webhook2fedmsg.yml +++ b/playbooks/openshift-apps/webhook2fedmsg.yml @@ -87,13 +87,13 @@ # Routes - role: openshift/route route_app: webhook2fedmsg - route_routename: web + route_name: web route_host: "webhook{{ env_suffix }}.fedoraproject.org" route_serviceport: web route_servicename: web - role: openshift/route route_app: webhook2fedmsg - route_routename: web-alt + route_name: web-alt route_host: "webhook2fedmsg.apps.ocp{{env_suffix}}.fedoraproject.org" route_serviceport: web route_servicename: web diff --git a/playbooks/openshift-apps/zezere.yml b/playbooks/openshift-apps/zezere.yml index a0f5dfe6ca..86aae5afeb 100644 --- a/playbooks/openshift-apps/zezere.yml +++ b/playbooks/openshift-apps/zezere.yml @@ -31,7 +31,7 @@ object_objectname: service.yml - role: openshift/route route_app: zezere - route_routename: zezere + route_name: zezere route_host: "provision{{ env_suffix }}.fedoraproject.org" route_servicename: zezere route_serviceport: 8080 diff --git a/roles/openshift/route/tasks/main.yml b/roles/openshift/route/tasks/main.yml index b30b04eea1..d3b53be136 100644 --- a/roles/openshift/route/tasks/main.yml +++ b/roles/openshift/route/tasks/main.yml @@ -1,8 +1,8 @@ --- -- name: route-{{route_routename}}.yml +- name: route-{{route_name}}.yml include_role: name: openshift/object vars: object_app: "{{route_app}}" - object_objectname: route-{{route_routename}}.yml + object_objectname: route-{{route_name}}.yml object_template_fullpath: "{{roles_path}}/openshift/route/templates/route.yml" diff --git a/roles/openshift/route/templates/route.yml b/roles/openshift/route/templates/route.yml index 4ea603ce49..783f33b89b 100644 --- a/roles/openshift/route/templates/route.yml +++ b/roles/openshift/route/templates/route.yml @@ -6,7 +6,7 @@ metadata: annotations: {{ route_annotations | to_nice_yaml | indent(4) }} {% endif %} - name: {{ route_routename }} + name: {{ route_name }} labels: app: {{ route_app }} spec: