From e0beb42848c8a2463ca47428dc34e83288b98a01 Mon Sep 17 00:00:00 2001
From: Andreas Hamacher <andreas.hamacher@monash.edu>
Date: Fri, 29 May 2020 11:38:30 +1000
Subject: [PATCH] factoring out the repository path to be able to switch
between centos and centos-staging
Former-commit-id: 504160912abb5f2f82762a4145bda350fc638a76
---
roles/config_repos/defaults/main.yml | 1 +
roles/config_repos/templates/monashhpc_base.repo.j2 | 8 ++++----
roles/config_repos/templates/monashhpc_others.repo.j2 | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/roles/config_repos/defaults/main.yml b/roles/config_repos/defaults/main.yml
index a5ac4ab9..15959bb8 100644
--- a/roles/config_repos/defaults/main.yml
+++ b/roles/config_repos/defaults/main.yml
@@ -3,3 +3,4 @@
reposervername: consistency0
reposerverip: 118.138.244.7
+repopath: centos
\ No newline at end of file
diff --git a/roles/config_repos/templates/monashhpc_base.repo.j2 b/roles/config_repos/templates/monashhpc_base.repo.j2
index 0f0cd119..a2682a43 100644
--- a/roles/config_repos/templates/monashhpc_base.repo.j2
+++ b/roles/config_repos/templates/monashhpc_base.repo.j2
@@ -2,24 +2,24 @@
[monashhpc_base]
name=MonashHPC base repository mirrored to control the update process
-baseurl=https://{{ reposervername }}/centos/$releasever/os/$basearch/
+baseurl=https://{{ reposervername }}/{{ repopath }}/$releasever/os/$basearch/
enabled=1
sslverify=false
[monashhpc_updates]
name=MonashHPC base repository mirrored to control the update process
-baseurl=https://{{ reposervername }}/centos/$releasever/updates/$basearch/
+baseurl=https://{{ reposervername }}/{{ repopath }}/$releasever/updates/$basearch/
enabled=1
sslverify=false
[monashhpc_extras]
name=MonashHPC base repository mirrored to control the update process
-baseurl=https://{{ reposervername }}/centos/$releasever/extras/$basearch/
+baseurl=https://{{ reposervername }}/{{ repopath }}/$releasever/extras/$basearch/
enabled=1
sslverify=false
[monashhpc_centosplus]
name=MonashHPC base repository mirrored to control the update process
-baseurl=https://{{ reposervername }}/centos/$releasever/centosplus/$basearch/
+baseurl=https://{{ reposervername }}/{{ repopath }}/$releasever/centosplus/$basearch/
enabled=1
sslverify=false
diff --git a/roles/config_repos/templates/monashhpc_others.repo.j2 b/roles/config_repos/templates/monashhpc_others.repo.j2
index bd0b0627..de20f992 100644
--- a/roles/config_repos/templates/monashhpc_others.repo.j2
+++ b/roles/config_repos/templates/monashhpc_others.repo.j2
@@ -2,7 +2,7 @@
[monashhpc_otherstuff]
name=MonashHPC base repository mirrored to control the update process
-baseurl=https://{{ reposervername }}/centos/hpcsystems/$releasever/$basearch/
+baseurl=https://{{ reposervername }}/{{ repopath }}/hpcsystems/$releasever/$basearch/
enabled=1
sslverify=false
gpgcheck=0
--
GitLab