Skip to content

C
configuration
Commit 6aef3d79 by Joseph Mulloy Committed by Jillian Vogel
Options

Restore ADDITIONAL_OPTS and set replicaSet everywhere 

(cherry picked from commit 207c5e0f)
parent e3e0fafc
Showing with 4 additions and 15 deletions
playbooks/roles/edxapp/defaults/main.yml
...@@ -466,6 +466,7 @@ EDXAPP_VERIFY_STUDENT: ...@@ -466,6 +466,7 @@ EDXAPP_VERIFY_STUDENT:
EXPIRING_SOON_WINDOW: 28 EXPIRING_SOON_WINDOW: 28
EDXAPP_GOOGLE_ANALYTICS_LINKEDIN: "" EDXAPP_GOOGLE_ANALYTICS_LINKEDIN: ""
EDXAPP_GOOGLE_ANALYTICS_TRACKING_ID: "" EDXAPP_GOOGLE_ANALYTICS_TRACKING_ID: ""
EDXAPP_CONTENTSTORE_ADDITIONAL_OPTS: {}
EDXAPP_BULK_EMAIL_EMAILS_PER_TASK: 500 EDXAPP_BULK_EMAIL_EMAILS_PER_TASK: 500
# If using microsites this should point to the microsite repo # If using microsites this should point to the microsite repo
EDXAPP_MICROSITE_ROOT_DIR: "{{ edxapp_app_dir }}/edx-microsite" EDXAPP_MICROSITE_ROOT_DIR: "{{ edxapp_app_dir }}/edx-microsite"
...@@ -871,6 +872,7 @@ edxapp_generic_contentstore_config: &edxapp_generic_default_contentstore ...@@ -871,6 +872,7 @@ edxapp_generic_contentstore_config: &edxapp_generic_default_contentstore
edxapp_generic_doc_store_config: &edxapp_generic_default_docstore edxapp_generic_doc_store_config: &edxapp_generic_default_docstore
db: "{{ EDXAPP_MONGO_DB_NAME }}" db: "{{ EDXAPP_MONGO_DB_NAME }}"
host: "{{ EDXAPP_MONGO_HOSTS }}" host: "{{ EDXAPP_MONGO_HOSTS }}"
replicaSet: "{{ EDXAPP_MONGO_REPLICA_SET }}"
password: "{{ EDXAPP_MONGO_PASSWORD }}" password: "{{ EDXAPP_MONGO_PASSWORD }}"
port: "{{ EDXAPP_MONGO_PORT }}" port: "{{ EDXAPP_MONGO_PORT }}"
user: "{{ EDXAPP_MONGO_USER }}" user: "{{ EDXAPP_MONGO_USER }}"
...@@ -1172,13 +1174,7 @@ lms_auth_config: ...@@ -1172,13 +1174,7 @@ lms_auth_config:
<<: *edxapp_generic_auth <<: *edxapp_generic_auth
CONTENTSTORE: CONTENTSTORE:
<<: *edxapp_generic_default_contentstore <<: *edxapp_generic_default_contentstore
ADDITIONAL_OPTIONS: ADDITIONAL_OPTIONS: "{{ EDXAPP_CONTENTSTORE_ADDITIONAL_OPTS }}"
default:
replicaSet: "{{ EDXAPP_MONGO_REPLICA_SET }}"
read_preference: "{{ EDXAPP_MONGO_LMS_READ_PREFERENCE }}"
trashcan:
replicaSet: "{{ EDXAPP_MONGO_REPLICA_SET }}"
read_preference: "{{ EDXAPP_MONGO_LMS_READ_PREFERENCE }}"
DOC_STORE_CONFIG: "{{ EDXAPP_LMS_SPLIT_DOC_STORE_CONFIG }}" DOC_STORE_CONFIG: "{{ EDXAPP_LMS_SPLIT_DOC_STORE_CONFIG }}"
DOC_STORE_CONFIG: "{{ EDXAPP_LMS_SPLIT_DOC_STORE_CONFIG }}" DOC_STORE_CONFIG: "{{ EDXAPP_LMS_SPLIT_DOC_STORE_CONFIG }}"
SEGMENT_KEY: "{{ EDXAPP_LMS_SEGMENT_KEY }}" SEGMENT_KEY: "{{ EDXAPP_LMS_SEGMENT_KEY }}"
...@@ -1273,14 +1269,7 @@ cms_auth_config: ...@@ -1273,14 +1269,7 @@ cms_auth_config:
<<: *edxapp_generic_auth <<: *edxapp_generic_auth
CONTENTSTORE: CONTENTSTORE:
<<: *edxapp_generic_default_contentstore <<: *edxapp_generic_default_contentstore
ADDITIONAL_OPTIONS: ADDITIONAL_OPTIONS: "{{ EDXAPP_CONTENTSTORE_ADDITIONAL_OPTS }}"
default:
replicaSet: "{{ EDXAPP_MONGO_REPLICA_SET }}"
read_preference: "{{ EDXAPP_MONGO_CMS_READ_PREFERENCE }}"
trashcan:
replicaSet: "{{ EDXAPP_MONGO_REPLICA_SET }}"
read_preference: "{{ EDXAPP_MONGO_CMS_READ_PREFERENCE }}"
DOC_STORE_CONFIG: "{{ EDXAPP_CMS_DOC_STORE_CONFIG }}"
DOC_STORE_CONFIG: "{{ EDXAPP_CMS_DOC_STORE_CONFIG }}" DOC_STORE_CONFIG: "{{ EDXAPP_CMS_DOC_STORE_CONFIG }}"
DOC_STORE_CONFIG: "{{ EDXAPP_CMS_DOC_STORE_CONFIG }}" DOC_STORE_CONFIG: "{{ EDXAPP_CMS_DOC_STORE_CONFIG }}"
MODULESTORE: MODULESTORE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment