From 65b64d432bf3c744302ec02347e74988aa1395e8 Mon Sep 17 00:00:00 2001 From: Piotr Surowiec Date: Tue, 30 Jan 2024 23:44:07 +0100 Subject: [PATCH] fix: allow defining MFE-specific env overrides while preserving extra defaults (#7090) (cherry picked from commit ee8a900fcd6e290a945912ef53f4b2fabbd73860) --- CHANGELOG.md | 5 +++++ playbooks/roles/mfe/defaults/main.yml | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e030f33756a..2a567ce4782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. Add any new changes to the top (right below this line). +- 2024-01-25 + - Role: mfe + - Added `MFE_ENVIRONMENT_DEFAULT_EXTRA` to allow operators to add extra environment variables to all MFEs when + deploying them with the `mfe_deployer` role. + - 2023-04-07 - Changed default value of `EDXAPP_MONGO_REPLICA_SET` to `null` from existing empty string `""`, to make it compatible with pymongo >= 3.11 in Nutmeg and above. diff --git a/playbooks/roles/mfe/defaults/main.yml b/playbooks/roles/mfe/defaults/main.yml index 7e1002a30a1..f4d058d60f3 100644 --- a/playbooks/roles/mfe/defaults/main.yml +++ b/playbooks/roles/mfe/defaults/main.yml @@ -139,8 +139,10 @@ MFE_ENVIRONMENT_DEFAULT: MFE_STANDALONE_NGINX: true +# This variable can be overridden to include extra defaults for all MFEs deployed with the `mfe_deployer` role. +MFE_ENVIRONMENT_DEFAULT_EXTRA: {} # NOTE: This should be overridden by inheriting MFE-specific role. MFE_ENVIRONMENT_EXTRA: {} -MFE_ENVIRONMENT: '{{ MFE_ENVIRONMENT_DEFAULT | combine(MFE_ENVIRONMENT_EXTRA) }}' +MFE_ENVIRONMENT: '{{ MFE_ENVIRONMENT_DEFAULT | combine(MFE_ENVIRONMENT_DEFAULT_EXTRA) | combine(MFE_ENVIRONMENT_EXTRA) }}' MFE_NPM_OVERRIDES: []