From eb3be51b785f4a81fbcc9a58707b4e7a4e689b81 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Fri, 17 May 2019 15:40:26 +0000 Subject: [PATCH] Correct Bodhi's wiki URLs for staging. To do this, I added an env_prefix variable - sometimes you need to be able to say "stg." instead of ".stg" (env_suffix), and this is an example. Signed-off-by: Randy Barlow --- inventory/group_vars/all | 1 + inventory/group_vars/staging | 1 + roles/bodhi2/base/templates/production.ini.j2 | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 5a2061afa4..eceff6477e 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -217,6 +217,7 @@ nrpe_check_postfix_queue_crit: 5 # env is staging or production, we default it to production here. env: production +env_prefix: env_suffix: env_short: prod diff --git a/inventory/group_vars/staging b/inventory/group_vars/staging index cede6baabd..7a3250629f 100644 --- a/inventory/group_vars/staging +++ b/inventory/group_vars/staging @@ -1,6 +1,7 @@ --- freezes: false env: staging +env_prefix: stg. env_suffix: .stg env_short: stg host_group: staging diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 0eb3e9e811..d0acbe0d01 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -103,8 +103,8 @@ datagrepper_url = https://apps{{env_suffix}}.fedoraproject.org/datagrepper query_wiki_test_cases = True # wiki_url = https://fedoraproject.org/w/api.php # test_case_base_url = https://fedoraproject.org/wiki/ -wiki_url = https://{{env_suffix}}fedoraproject.org/w/api.php -test_case_base_url = https://{{env_suffix}}fedoraproject.org/wiki/ +wiki_url = https://{{env_prefix}}fedoraproject.org/w/api.php +test_case_base_url = https://{{env_prefix}}fedoraproject.org/wiki/ # URL of the resultsdb for integrating checks and stuff # resultsdb_api_url = https://taskotron.fedoraproject.org/resultsdb_api/