From 1c4a717be3cd058e278c2c676e9c78feec676394 Mon Sep 17 00:00:00 2001
From: Jeremy Freudberg <jeremyfreudberg@gmail.com>
Date: Wed, 2 Sep 2020 15:54:46 -0400
Subject: [PATCH] Remove hardcoded x86_64

For the benefit of ppc64le and others

Change-Id: I1aee2a970f0686ff42e6959b9880e4bc176cf349
Co-Authored-By: Michael Turek <mjturek@linux.vnet.ibm.com>
---
 tripleo_repos/main.py            | 8 ++++----
 tripleo_repos/tests/test_main.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tripleo_repos/main.py b/tripleo_repos/main.py
index 3beee8a..c3bbfd4 100755
--- a/tripleo_repos/main.py
+++ b/tripleo_repos/main.py
@@ -46,14 +46,14 @@ DEFAULT_MIRROR_MAP = {
 CEPH_REPO_TEMPLATE = '''
 [tripleo-centos-ceph-%(ceph_release)s]
 name=tripleo-centos-ceph-%(ceph_release)s
-baseurl=%(mirror)s/centos/%(centos_release)s/storage/x86_64/ceph-%(ceph_release)s/
+baseurl=%(mirror)s/centos/%(centos_release)s/storage/$basearch/ceph-%(ceph_release)s/
 gpgcheck=0
 enabled=1
 '''
 OPSTOOLS_REPO_TEMPLATE = '''
 [tripleo-centos-opstools]
 name=tripleo-centos-opstools
-baseurl=%s/centos/7/opstools/x86_64/
+baseurl=%s/centos/7/opstools/$basearch/
 gpgcheck=0
 enabled=1
 '''
@@ -61,7 +61,7 @@ enabled=1
 HIGHAVAILABILITY_REPO_TEMPLATE = '''
 [tripleo-centos-highavailability]
 name=tripleo-centos-highavailability
-baseurl=%s/centos/8/HighAvailability/x86_64/os/
+baseurl=%s/centos/8/HighAvailability/$basearch/os/
 gpgcheck=0
 enabled=1
 '''
@@ -69,7 +69,7 @@ enabled=1
 POWERTOOLS_REPO_TEMPLATE = '''
 [tripleo-centos-powertools]
 name=tripleo-centos-powertools
-baseurl=%s/centos/8/PowerTools/x86_64/os/
+baseurl=%s/centos/8/PowerTools/$basearch/os/
 gpgcheck=0
 enabled=1
 '''
diff --git a/tripleo_repos/tests/test_main.py b/tripleo_repos/tests/test_main.py
index 31b5b41..e6cc9f6 100644
--- a/tripleo_repos/tests/test_main.py
+++ b/tripleo_repos/tests/test_main.py
@@ -327,7 +327,7 @@ class TestTripleORepos(testtools.TestCase):
         main._install_repos(args, 'roads/')
         expected_repo = ('\n[tripleo-centos-opstools]\n'
                          'name=tripleo-centos-opstools\n'
-                         'baseurl=http://foo/centos/7/opstools/x86_64/\n'
+                         'baseurl=http://foo/centos/7/opstools/$basearch/\n'
                          'gpgcheck=0\n'
                          'enabled=1\n')
         mock_write.assert_called_once_with(expected_repo,
@@ -437,7 +437,7 @@ enabled=1
         expected_repo = '''
 [tripleo-centos-ceph-jewel]
 name=tripleo-centos-ceph-jewel
-baseurl=http://foo/centos/8/storage/x86_64/ceph-jewel/
+baseurl=http://foo/centos/8/storage/$basearch/ceph-jewel/
 gpgcheck=0
 enabled=1
 '''