Merge pull request #2933 from edx/clintonb/lms-root-url

Added EDXAPP_LMS_ROOT_URL variable

playbooks/roles/discovery/defaults/main.yml

@@ -71,8 +71,10 @@ DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
 
 DISCOVERY_PLATFORM_NAME: 'Your Platform Name Here'
 
+DISCOVERY_LMS_ROOT_URL: '{{ EDXAPP_LMS_ROOT_URL | default("http://127.0.0.1:8000") }}'
 DISCOVERY_ECOMMERCE_API_URL: 'https://localhost:8002/api/v2/'
-DISCOVERY_COURSES_API_URL: 'https://localhost:8000/api/courses/v1/'
+DISCOVERY_COURSES_API_URL: '{{ DISCOVERY_LMS_ROOT_URL }}/api/courses/v1/'
+DISCOVERY_ORGANIZATIONS_API_URL: '{{ DISCOVERY_LMS_ROOT_URL }}/api/organizations/v0/'
 DISCOVERY_MARKETING_API_URL: 'https://example.org/api/catalog/v2/'
 DISCOVERY_MARKETING_URL_ROOT: 'https://example.org/'
 
@@ -99,6 +101,7 @@ DISCOVERY_SERVICE_CONFIG:
 
   ECOMMERCE_API_URL: '{{ DISCOVERY_ECOMMERCE_API_URL }}'
   COURSES_API_URL: '{{ DISCOVERY_COURSES_API_URL }}'
+  ORGANIZATIONS_API_URL: '{{ DISCOVERY_ORGANIZATIONS_API_URL }}'
   MARKETING_API_URL: '{{ DISCOVERY_MARKETING_API_URL }}'
   MARKETING_URL_ROOT: '{{ DISCOVERY_MARKETING_URL_ROOT }}'
 

playbooks/roles/edxapp/defaults/main.yml

@@ -248,7 +248,8 @@ EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL: 'no-reply@example.com'
 EDXAPP_BULK_EMAIL_LOG_SENT_EMAILS: false
 EDXAPP_UNIVERSITY_EMAIL: 'university@example.com'
 EDXAPP_PRESS_EMAIL: 'press@example.com'
-EDXAPP_LMS_ISSUER: "{{ EDXAPP_LMS_BASE_SCHEME | default('https') }}://{{ EDXAPP_LMS_BASE }}/oauth2"
+EDXAPP_LMS_ROOT_URL: "{{ EDXAPP_LMS_BASE_SCHEME | default('https') }}://{{ EDXAPP_LMS_BASE }}"
+EDXAPP_LMS_ISSUER: "{{ EDXAPP_LMS_ROOT_URL }}/oauth2"
 EDXAPP_JWT_EXPIRATION: 30  # Number of seconds until expiration
 EDXAPP_JWT_AUDIENCE: "lms-key"
 EDXAPP_JWT_SECRET_KEY: "lms-secret"