openstack/charm-glance-simplestreams-sync
Code Issues Proposed changes

Fix the trailing-slash issue on for product-streams endpoint

Browse Source 
ceph-radosgw is now more strict and can't handle non-canonical
paths in http requests; this patch stopes that happening, and ensures
that the endpoint is set without a trailing slash.

Change-Id: I1c2de2aad2f7652906d91865e5e214b403d2a37b
This commit is contained in:
Alex Kavanagh 2022-04-11 18:57:17 +01:00
parent de4f9a6a97
commit 91e4aea451
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/glance_simplestreams_sync.py
View File

@ -81,7 +81,7 @@ SYNC_RUNNING_FLAG_FILE_NAME = os.path.join(PID_FILE_DIR,
# juju looks in simplestreams/data/* in swift to figure out which # juju looks in simplestreams/data/* in swift to figure out which
# images to deploy, so this path isn't really configurable even though # images to deploy, so this path isn't really configurable even though
# it is. # it is.
SWIFT_DATA_DIR = 'simplestreams/data/' SWIFT_DATA_DIR = 'simplestreams/data'
# When running local apache for product-streams use path to place indexes. # When running local apache for product-streams use path to place indexes.
APACHE_DATA_DIR = '/var/www/html' APACHE_DATA_DIR = '/var/www/html'
@ -278,7 +278,7 @@ def do_sync(ksc, charm_conf):
if charm_conf['use_swift']: if charm_conf['use_swift']:
sync_command += [ sync_command += [
'--output-swift', '--output-swift',
SWIFT_DATA_DIR "{}/".format(SWIFT_DATA_DIR)
] ]
else: else:
# For debugging purposes only. # For debugging purposes only.