Skip to content

Commit

Permalink
chore: allow usage of https in URL for distro tree
Browse files Browse the repository at this point in the history
When specifying the URL for the location of the distro for a lab
controller, allow usage of `https` URLs.

Previously you could add an `https` URL, but then when provisioning
the system it would fail with the error:
  Command 1234566 aborted: No usable URL found for distro tree 123 in lab lab1.example.com
  • Loading branch information
JohnVillalovos committed Jun 14, 2024
1 parent 6a2898c commit 4115e9c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Server/bkr/server/distrotrees.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def yum_config(self, distro_tree_id, *args, **kwargs):
except NoResultFound:
raise cherrypy.HTTPError(status=400,
message='No such lab controller %r' % kwargs['lab'])
base = distro_tree.url_in_lab(lc, scheme='http')
base = distro_tree.url_in_lab(lc, scheme=['https', 'http'])
if not base:
raise cherrypy.HTTPError(status=404,
message='%s is not present in lab %s' % (distro_tree, lc))
Expand Down
2 changes: 1 addition & 1 deletion Server/bkr/server/model/distrolibrary.py
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ def url_in_lab(self, lab_controller, scheme=None, required=False):
if s in urls:
return urls[s]
else:
for s in ['nfs', 'http', 'ftp']:
for s in ['nfs', 'https', 'http', 'ftp']:
if s in urls:
return urls[s]
# caller didn't specify any schemes, so pick anything if we have it
Expand Down

0 comments on commit 4115e9c

Please sign in to comment.