From 6a34b52982f3d4d004f4dff30cd9ff4aeb33129b Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 3 Dec 2021 13:26:23 -0700 Subject: [PATCH] Stop creating manifest .htaccess This is no longer needed as this isn't dynamic so we can moved it to the image-server httpd configuration. Additionally MultiviewsMatch is causing problems so we don't want that anymore. This file will be ignored with the updated configuration so this just stops it from being created going forward. Depends-On: https://review.opendev.org/c/openstack/tripleo-ansible/+/820404 Change-Id: I307be36cfdd26510bbe5b48365d6c04881f61d1f Related-Bug: #1953198 --- tripleo_common/image/image_export.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tripleo_common/image/image_export.py b/tripleo_common/image/image_export.py index e6f8911d6..687ee1ef8 100644 --- a/tripleo_common/image/image_export.py +++ b/tripleo_common/image/image_export.py @@ -261,17 +261,12 @@ def export_manifest_config(target_url, manifests_path = os.path.join( IMAGE_EXPORT_DIR, 'v2', image, 'manifests') - manifests_htaccess_path = os.path.join(manifests_path, '.htaccess') manifest_dir_path = os.path.join(manifests_path, manifest_digest) manifest_path = os.path.join(manifest_dir_path, 'index.json') htaccess_path = os.path.join(manifest_dir_path, '.htaccess') make_dir(manifest_dir_path) - with open(manifests_htaccess_path, 'w+') as f: - f.write('AddHandler type-map %s\n' % TYPE_MAP_EXTENSION) - f.write('MultiviewsMatch Handlers\n') - headers = collections.OrderedDict() headers['Content-Type'] = manifest_type headers['Docker-Content-Digest'] = manifest_digest