Merge pull request #4137 from open-craft/uman/configurable-discovery-repo

Make discovery repository details configurable.

CHANGELOG.md

 - Role: discovery
+  - Added `DISCOVERY_REPOS` to allow configuring discovery repository details.
+
+- Role: edx_django_service
+  - Made the keys `edx_django_service_git_protocol`, `edx_django_service_git_domain`, and `edx_django_service_git_path` of `edx_django_service_repos` all individually configurable.
+
+- Role: discovery
   - Updated LANGUAGE_CODE to generic english. Added configuration for multilingual language package django-parler.
 
 - Role: edxapp

playbooks/roles/discovery/defaults/main.yml

@@ -11,6 +11,7 @@
 # Defaults for role discovery
 #
 
+DISCOVERY_GIT_IDENTITY: !!null
 
 #
 # vars are namespace with the module name.
@@ -23,6 +24,7 @@ discovery_environment:
 
 discovery_user: "{{ discovery_service_name }}"
 discovery_home: "{{ COMMON_APP_DIR }}/{{ discovery_service_name }}"
+discovery_code_dir: "{{ discovery_home }}/{{ discovery_service_name }}"
 
 #
 # OS packages
@@ -115,6 +117,15 @@ DISCOVERY_GUNICORN_EXTRA: ''
 
 DISCOVERY_EXTRA_APPS: []
 
+DISCOVERY_REPOS:
+  - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
+    DOMAIN: "{{ COMMON_GIT_MIRROR }}"
+    PATH: "{{ COMMON_GIT_PATH }}"
+    REPO: 'course-discovery.git'
+    VERSION: "{{ DISCOVERY_VERSION }}"
+    DESTINATION: "{{ discovery_code_dir }}"
+    SSH_KEY: "{{ DISCOVERY_GIT_IDENTITY }}"
+
 discovery_service_config_overrides:
   ELASTICSEARCH_URL: '{{ DISCOVERY_ELASTICSEARCH_URL }}'
   ELASTICSEARCH_INDEX_NAME: '{{ DISCOVERY_ELASTICSEARCH_INDEX_NAME }}'

playbooks/roles/discovery/meta/main.yml

@@ -20,8 +20,7 @@
 # }
 dependencies:
   - role: edx_django_service
-    edx_django_service_repo: 'course-discovery'
-    edx_django_service_version: '{{ DISCOVERY_VERSION }}'
+    edx_django_service_repos: '{{ DISCOVERY_REPOS }}'
     edx_django_service_name: '{{ discovery_service_name }}'
     edx_django_service_user: '{{ discovery_user }}'
     edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ discovery_service_name }}'

playbooks/roles/edx_django_service/defaults/main.yml

@@ -16,7 +16,9 @@ edx_django_service_name_devstack_logs:
   - '{{ supervisor_log_dir }}/{{ edx_django_service_name }}-stdout.log'
   - '{{ supervisor_log_dir }}/{{ edx_django_service_name }}-stderr.log'
 
-
+edx_django_service_git_protocol: '{{ COMMON_GIT_PROTOCOL }}'
+edx_django_service_git_domain: '{{ COMMON_GIT_MIRROR }}'
+edx_django_service_git_path: '{{ COMMON_GIT_PATH }}'
 edx_django_service_version: 'master'
 edx_django_service_git_identity: null
 edx_django_service_django_settings_module: null
@@ -76,9 +78,9 @@ edx_django_service_basic_auth_exempted_paths: '{{ edx_django_service_basic_auth_
 edx_django_service_newrelic_appname: '{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ edx_django_service_name }}'
 
 edx_django_service_repos:
-  - PROTOCOL: '{{ COMMON_GIT_PROTOCOL }}'
-    DOMAIN: '{{ COMMON_GIT_MIRROR }}'
-    PATH: '{{ COMMON_GIT_PATH }}'
+  - PROTOCOL: '{{ edx_django_service_git_protocol }}'
+    DOMAIN: '{{ edx_django_service_git_domain }}'
+    PATH: '{{ edx_django_service_git_path }}'
     REPO: '{{ edx_django_service_repo }}.git'
     VERSION: '{{ edx_django_service_version }}'
     DESTINATION: '{{ edx_django_service_code_dir }}'