Merge branch 'master' into platform/update-forums-to-ruby23

.github/PULL_REQUEST_TEMPLATE.md

+Configuration Pull Request
+---
+
+Make sure that the following steps are done before merging
+
+  - [ ] @devops team member has commented with :+1:
+  - [ ] are you adding any new default values that need to be overriden when this goes live?  
+    - [ ] Open a ticket (DEVOPS) to make sure that they have been added to secure vars.
+    - [ ] Add an entry to the CHANGELOG.

playbooks/roles/discovery/defaults/main.yml

@@ -91,6 +91,8 @@ DISCOVERY_MARKETING_API_URL: 'https://example.org/api/catalog/v2/'
 DISCOVERY_MARKETING_URL_ROOT: 'https://example.org/'
 DISCOVERY_PROGRAMS_API_URL: 'https://replace-me/api/v1/'
 
+DISCOVERY_EXTRA_APPS: []
+
 DISCOVERY_SERVICE_CONFIG:
   SECRET_KEY: '{{ DISCOVERY_SECRET_KEY }}'
   TIME_ZONE: '{{ DISCOVERY_TIME_ZONE }}'
@@ -128,6 +130,8 @@ DISCOVERY_SERVICE_CONFIG:
 
   DEFAULT_PARTNER_ID: '{{ DISCOVERY_DEFAULT_PARTNER_ID }}'
 
+  EXTRA_APPS: '{{ DISCOVERY_EXTRA_APPS }}'
+
 DISCOVERY_REPOS:
   - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
     DOMAIN: "{{ COMMON_GIT_MIRROR }}"