Revert "load dynamodb config from consul instead of yml"
This reverts commit a8cb21616c
.
Change-Id: Ice3ead98d4a33b5df14b52b349255eeb5d2df76c
Reviewed-on: https://gerrit.instructure.com/211016
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
parent
6e0586f9eb
commit
88eaabeed6
|
@ -44,13 +44,6 @@ development:
|
|||
# permissions (such as microphone/camera access) per-file. You must have wildcard
|
||||
# DNS set up for this to work.
|
||||
attachment_specific_file_domain: true
|
||||
dynamodb.yml: |
|
||||
auditors:
|
||||
region: US East
|
||||
access_key_id: ASDFASDF
|
||||
secret_access_key: ZXCVZXCV
|
||||
endpoint: http://localhost:8000
|
||||
table_prefix: canvas_auditors
|
||||
ha_cache.yml: |
|
||||
cache_store: ha_store
|
||||
servers:
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
development:
|
||||
auditors:
|
||||
region: US East
|
||||
access_key_id: ASDFASDF
|
||||
secret_access_key: ZXCVZXCV
|
||||
endpoint: http://localhost:8000
|
||||
table_prefix: canvas_auditors
|
|
@ -72,7 +72,7 @@ module Canvas
|
|||
end
|
||||
|
||||
def self.configs(environment = default_environment)
|
||||
YAML.load(Canvas::DynamicSettings.find(tree: :private)['dynamodb.yml'] || '{}').with_indifferent_access
|
||||
ConfigFile.load('dynamodb', environment) || {}
|
||||
end
|
||||
|
||||
def self.categories
|
||||
|
|
Loading…
Reference in New Issue