Skip to content

Commit 8fd2b75

Browse files
committed
Remove matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled
Fixes #4637 We no longer need to boto workaround since s3-storage-provider got upgraded to v1.6.0 in #4635
1 parent 9fb28c9 commit 8fd2b75

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

roles/custom/matrix-synapse/defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ matrix_synapse_container_image_customizations_enabled: |-
4848
# The version that will be installed is specified in `matrix_synapse_ext_synapse_s3_storage_provider_version`.
4949
matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled: "{{ matrix_synapse_ext_synapse_s3_storage_provider_enabled }}"
5050

51-
# Controls whether to install an old version of boto3 and botocore, to work around the following issue:
52-
# https://github.com/aws/aws-cli/issues/9214
53-
matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled: true
54-
5551
# Controls whether custom build steps will be added to the Dockerfile for installing auto-accept-invite module.
5652
# The version that will be installed is specified in `matrix_synapse_ext_synapse_auto_accept_invite_version`.
5753
matrix_synapse_container_image_customizations_auto_accept_invite_installation_enabled: "{{ matrix_synapse_ext_synapse_auto_accept_invite_enabled }}"

roles/custom/matrix-synapse/tasks/validate_config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@
117117
- {'old': 'matrix_synapse_experimental_features_msc3861_admin_token', 'new': '<removed>'}
118118
- {'old': 'matrix_synapse_experimental_features_msc3861_account_management_url', 'new': '<removed>'}
119119

120+
- {'old': 'matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled', 'new': '<removed; see https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4637>'}
121+
120122
- name: (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml
121123
ansible.builtin.fail:
122124
msg: >-

roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@ RUN pip install synapse-auto-accept-invite=={{ matrix_synapse_ext_synapse_auto_a
4545
{% endif %}
4646

4747
{% if matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled %}
48-
{% if matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled %}
49-
RUN pip install 'boto3<1.36.0' 'botocore<1.36.0' synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
50-
{% else %}
5148
RUN pip install synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
5249
{% endif %}
53-
{% endif %}
5450

5551
{% if matrix_synapse_container_image_customizations_templates_enabled %}
5652
COPY --from=templates-builder {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }} {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }}

0 commit comments

Comments
 (0)