This repository was archived by the owner on Aug 22, 2022. It is now read-only.
Repository navigation
Set EDXAPP_IMPORT_EXPORT_BUCKET to null #206
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,7 +61,10 @@ def get_storage_settings(self): | |
| Only needed when not using ephemeral databases | ||
| """ | ||
| if self.use_ephemeral_databases: | ||
| return '' | ||
| # Workaround for broken CMS course export/import | ||
| # caused by https://github.com/edx/edx-platform/pull/14552 | ||
| template = loader.get_template('instance/ansible/ephemeral.yml') | ||
| return template.render() | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @replaceafill Can we make sure to revert once the upstream PR is merged? To ensure we don't forget, I would only close the current ticket once both the upstream PR is merged and this reverted.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @antoviaque This is actually more a fix than a workaround, and it has to be here as well as the upstream PR.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh, right - forget my comment then. Sorry for the noise. |
||
|
|
||
| new_settings = '' | ||
| if self.s3_access_key and self.s3_secret_access_key and self.s3_bucket_name: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| EDXAPP_IMPORT_EXPORT_BUCKET: !!null |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@replaceafill nit: Could you remove this comment? It doesn't apply anymore, since you've added
ephemeral.yml.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pomegranited Removed. I also changed the EDXAPP_IMPORT_EXPORT_BUCKET setting to an empty string to be consistent with the change we made to the configuration repo.