Merge pull request #154 from SUSE-Enceladus/regAuthFixes

Move the registry auth script
SUSE-Enceladus · Apr 17, 2024 · faa4594 · faa4594
2 parents 1b973a4 + ea750ea
commit faa4594
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/cloud-regionsrv-client.spec b/cloud-regionsrv-client.spec
@@ -186,8 +186,10 @@ fi
 %dir %{_usr}/lib/zypp/plugins/urlresolver
 %dir /var/cache/cloudregister
 %{_mandir}/man*/*
+# Do not expect the user that needs containers to have root access
+# on the system
+%{_bindir}/cloudguestregistryauth
 %{_sbindir}/cloudguest-repo-service
-%{_sbindir}/cloudguestregistryauth
 %{_sbindir}/containerbuild-regionsrv
 %{_sbindir}/createregioninfo
 %{_sbindir}/switchcloudguestservices

diff --git a/tests/test_cloudguestregistryauth.py b/tests/test_cloudguestregistryauth.py
@@ -21,7 +21,7 @@
 # Hack to get the script without the .py imported for testing
 cloudguestregistryauth = SourceFileLoader(
     'cloudguestregistryauth',
-    './usr/sbin/cloudguestregistryauth'
+    './usr/bin/cloudguestregistryauth'
 ).load_module()
 
 

diff --git a/tox.ini b/tox.ini
@@ -47,5 +47,5 @@ skip_install = True
 usedevelop = True
 commands =
     flake8 --statistics -j auto --count {toxinidir}/lib/cloudregister
-    flake8 --statistics -j auto --count {toxinidir}/usr/sbin/cloudguestregistryauth
-    flake8 --statistics -j auto --count {toxinidir}/tests
+    flake8 --statistics -j auto --count {toxinidir}/usr/bin/cloudguestregistryauth
+    flake8 --statistics -j auto --count {toxinidir}/tests
diff --git a/usr/sbin/cloudguestregistryauth → usr/bin/cloudguestregistryauth b/usr/sbin/cloudguestregistryauth → usr/bin/cloudguestregistryauth