From 49066d41a9eeadb7a322d16988715a6af7930da5 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 13 Jan 2024 17:49:38 +0200 Subject: [PATCH] Deprecate matrix_docker_network --- roles/custom/matrix-base/defaults/main.yml | 3 --- roles/custom/matrix-base/tasks/setup_matrix_base.yml | 5 ----- .../matrix_playbook_migration/tasks/validate_config.yml | 1 + 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml index 04020753f..c155fda7e 100644 --- a/roles/custom/matrix-base/defaults/main.yml +++ b/roles/custom/matrix-base/defaults/main.yml @@ -177,9 +177,6 @@ matrix_identity_server_url: ~ matrix_integration_manager_rest_url: ~ matrix_integration_manager_ui_url: ~ -# The Docker network that all services would be put into -matrix_docker_network: "matrix" - matrix_homeserver_container_extra_arguments_auto: [] matrix_homeserver_app_service_config_files_auto: [] diff --git a/roles/custom/matrix-base/tasks/setup_matrix_base.yml b/roles/custom/matrix-base/tasks/setup_matrix_base.yml index 3d95af020..448ac7693 100644 --- a/roles/custom/matrix-base/tasks/setup_matrix_base.yml +++ b/roles/custom/matrix-base/tasks/setup_matrix_base.yml @@ -11,11 +11,6 @@ - "{{ matrix_base_data_path }}" - "{{ matrix_bin_path }}" -- name: Ensure Matrix network is created in Docker - community.docker.docker_network: - name: "{{ matrix_docker_network }}" - driver: bridge - - name: Ensure remove-all script created ansible.builtin.template: src: "{{ role_path }}/templates/bin/remove-all.j2" diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml index 364805c7c..801f470e2 100644 --- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml +++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml @@ -134,6 +134,7 @@ - {'old': 'matrix_prometheus_services_proxy_connect_prometheus_node_exporter_matrix_nginx_proxy_not_enabled_proxy_pass_host', 'new': ''} - {'old': 'matrix_prometheus_services_proxy_connect_prometheus_postgres_exporter_metrics_proxying_enabled', 'new': ''} - {'old': 'matrix_prometheus_services_proxy_connect_prometheus_postgres_exporter_matrix_nginx_proxy_not_enabled_proxy_pass_host', 'new': ''} + - {'old': 'matrix_docker_network', 'new': ''} - name: (Deprecation) Catch and report matrix_postgres variables ansible.builtin.fail: