diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dd0c6b1..13379848 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ for the list of changes in SaltStack. **3004.2** - Upgrade `salt-master` to `3004.2` *Silicon* +- Remove Jinja2 patch to avoid Markup import error **3004.1** diff --git a/assets/build/install.sh b/assets/build/install.sh index 8a7615e0..ab952c80 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -72,10 +72,6 @@ log_debug "Options: ${SALT_BOOTSTRAP_OPTS[@]}" sh "${BOOTSTRAP_FILE}" ${SALT_BOOTSTRAP_OPTS[@]} git "v${SALT_VERSION}" chown -R "${SALT_USER}": "${SALT_ROOT_DIR}" -# Fix Jinja2 version to avoid Markup import error -# https://github.com/saltstack/salt/issues/61848 -pip3 install -I markupsafe==2.0.1 jinja2==3.0.3 - # Configure ssh log_info "Configuring ssh ..." sed -i -e "s|^[# ]*StrictHostKeyChecking.*$| StrictHostKeyChecking no|" /etc/ssh/ssh_config