Commit d19d49f0 by root

设置部分扩展程序的默认分支为ginkgo.master

parent 6116fb99
...@@ -57,7 +57,8 @@ ANALYTICS_API_DATABASES: ...@@ -57,7 +57,8 @@ ANALYTICS_API_DATABASES:
PORT: '{{ ANALYTICS_API_REPORTS_PORT }}' PORT: '{{ ANALYTICS_API_REPORTS_PORT }}'
OPTIONS: "{{ ANALYTICS_API_REPORTS_MYSQL_OPTIONS }}" OPTIONS: "{{ ANALYTICS_API_REPORTS_MYSQL_OPTIONS }}"
ANALYTICS_API_VERSION: "master" #ANALYTICS_API_VERSION: "master"
ANALYTICS_API_VERSION: "open-release/ginkgo.master"
# Default dummy user, override this!! # Default dummy user, override this!!
ANALYTICS_API_USERS: ANALYTICS_API_USERS:
"dummy-api-user": "changeme" "dummy-api-user": "changeme"
......
...@@ -60,7 +60,8 @@ COMMON_EDX_PPA_KEY_ID: "69464050" ...@@ -60,7 +60,8 @@ COMMON_EDX_PPA_KEY_ID: "69464050"
#The git checkout url in most roles is constructed from these values #The git checkout url in most roles is constructed from these values
#e.g. https://{{COMMON_GIT_MIRROR}}/{{COMMON_GIT_PATH}}/repo.git #e.g. https://{{COMMON_GIT_MIRROR}}/{{COMMON_GIT_PATH}}/repo.git
COMMON_GIT_PROTOCOL: 'https' # https|ssh COMMON_GIT_PROTOCOL: 'https' # https|ssh
COMMON_GIT_MIRROR: 'github.com' # git server hostname #COMMON_GIT_MIRROR: 'github.com' # git server hostname
COMMON_GIT_MIRROR: 'git.orhontech.com' # git server hostname
COMMON_GIT_PATH: 'edx' # git path prefix COMMON_GIT_PATH: 'edx' # git path prefix
# override this var to set a different hostname # override this var to set a different hostname
......
...@@ -17,7 +17,8 @@ demo_app_dir: "{{ COMMON_APP_DIR }}/demo" ...@@ -17,7 +17,8 @@ demo_app_dir: "{{ COMMON_APP_DIR }}/demo"
demo_code_dir: "{{ demo_app_dir }}/edx-demo-course" demo_code_dir: "{{ demo_app_dir }}/edx-demo-course"
demo_repo: "https://{{ COMMON_GIT_MIRROR }}/edx/edx-demo-course.git" demo_repo: "https://{{ COMMON_GIT_MIRROR }}/edx/edx-demo-course.git"
demo_course_id: 'course-v1:edX+DemoX+Demo_Course' demo_course_id: 'course-v1:edX+DemoX+Demo_Course'
demo_version: "master" #demo_version: "master"
demo_version: "open-release/ginkgo.master"
demo_hashed_password: 'pbkdf2_sha256$20000$TjE34FJjc3vv$0B7GUmH8RwrOc/BvMoxjb5j8EgnWTt3sxorDANeF7Qw=' # edx demo_hashed_password: 'pbkdf2_sha256$20000$TjE34FJjc3vv$0B7GUmH8RwrOc/BvMoxjb5j8EgnWTt3sxorDANeF7Qw=' # edx
demo_test_users: demo_test_users:
- email: 'honor@example.com' - email: 'honor@example.com'
......
...@@ -53,7 +53,8 @@ DISCOVERY_ELASTICSEARCH_INDEX_NAME: 'catalog' ...@@ -53,7 +53,8 @@ DISCOVERY_ELASTICSEARCH_INDEX_NAME: 'catalog'
DISCOVERY_MEMCACHE: [ 'memcache' ] DISCOVERY_MEMCACHE: [ 'memcache' ]
DISCOVERY_VERSION: "master" #DISCOVERY_VERSION: "master"
DISCOVERY_VERSION: "open-release/ginkgo.master"
DISCOVERY_DJANGO_SETTINGS_MODULE: "course_discovery.settings.production" DISCOVERY_DJANGO_SETTINGS_MODULE: "course_discovery.settings.production"
DISCOVERY_URL_ROOT: 'http://discovery:{{ DISCOVERY_NGINX_PORT }}' DISCOVERY_URL_ROOT: 'http://discovery:{{ DISCOVERY_NGINX_PORT }}'
DISCOVERY_LOGOUT_URL: '{{ DISCOVERY_URL_ROOT }}/logout/' DISCOVERY_LOGOUT_URL: '{{ DISCOVERY_URL_ROOT }}/logout/'
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
# #
ECOMMERCE_WORKER_GIT_IDENTITY: !!null ECOMMERCE_WORKER_GIT_IDENTITY: !!null
ECOMMERCE_WORKER_VERSION: 'master' #ECOMMERCE_WORKER_VERSION: 'master'
ECOMMERCE_WORKER_VERSION: 'open-release/ginkgo.master'
ECOMMERCE_WORKER_REPOS: ECOMMERCE_WORKER_REPOS:
- PROTOCOL: '{{ COMMON_GIT_PROTOCOL }}' - PROTOCOL: '{{ COMMON_GIT_PROTOCOL }}'
DOMAIN: '{{ COMMON_GIT_MIRROR }}' DOMAIN: '{{ COMMON_GIT_MIRROR }}'
......
...@@ -45,19 +45,19 @@ ...@@ -45,19 +45,19 @@
- install:base - install:base
# Do A Checkout # Do A Checkout
- name: checkout edx-platform repo into {{ edxapp_code_dir }} #- name: checkout edx-platform repo into {{ edxapp_code_dir }}
git: # git:
dest: "{{ edxapp_code_dir }}" # dest: "{{ edxapp_code_dir }}"
repo: "{{ edx_platform_repo }}" # repo: "{{ edx_platform_repo }}"
version: "{{ edx_platform_version }}" # version: "{{ edx_platform_version }}"
accept_hostkey: yes # accept_hostkey: yes
become_user: "{{ edxapp_user }}" # become_user: "{{ edxapp_user }}"
environment: # environment:
GIT_SSH: "{{ edxapp_git_ssh }}" # GIT_SSH: "{{ edxapp_git_ssh }}"
register: edxapp_platform_checkout # register: edxapp_platform_checkout
tags: # tags:
- install # - install
- install:code # - install:code
- name: git clean after checking out edx-platform - name: git clean after checking out edx-platform
shell: cd {{ edxapp_code_dir }} && git clean -xdf shell: cd {{ edxapp_code_dir }} && git clean -xdf
......
...@@ -155,10 +155,10 @@ ...@@ -155,10 +155,10 @@
- assets - assets
# Gather assets using paver if possible # Gather assets using paver if possible
- name: "gather {{ item }} static assets with paver" #- name: "gather {{ item }} static assets with paver"
command: "{{ COMMON_BIN_DIR }}/edxapp-update-assets-{{ item }}" # command: "{{ COMMON_BIN_DIR }}/edxapp-update-assets-{{ item }}"
when: celery_worker is not defined and not devstack and item != "lms-preview" # when: celery_worker is not defined and not devstack and item != "lms-preview"
with_items: "{{ service_variants_enabled }}" # with_items: "{{ service_variants_enabled }}"
tags: # tags:
- gather_static_assets # - gather_static_assets
- assets # - assets
...@@ -84,8 +84,8 @@ devstack_forum_env: ...@@ -84,8 +84,8 @@ devstack_forum_env:
forum_user: "forum" forum_user: "forum"
forum_ruby_version: "2.4.1" forum_ruby_version: "2.4.1"
forum_source_repo: "https://git.orhontech.com/edx/cs_comments_service.git" forum_source_repo: "https://git.orhontech.com/edx/cs_comments_service.git"
forum_version: "master" #forum_version: "master"
forum_version: "open-release/ginkgo.master"
# #
# test config # test config
# #
......
...@@ -158,7 +158,8 @@ INSIGHTS_COURSE_API_URL: "{{ INSIGHTS_LMS_BASE }}/api/courses/v1/" ...@@ -158,7 +158,8 @@ INSIGHTS_COURSE_API_URL: "{{ INSIGHTS_LMS_BASE }}/api/courses/v1/"
INSIGHTS_GRADING_POLICY_API_URL: "{{ INSIGHTS_LMS_BASE }}/api/grades/v0/" INSIGHTS_GRADING_POLICY_API_URL: "{{ INSIGHTS_LMS_BASE }}/api/grades/v0/"
INSIGHTS_MODULE_PREVIEW_URL: "{{ INSIGHTS_LMS_BASE }}/xblock" INSIGHTS_MODULE_PREVIEW_URL: "{{ INSIGHTS_LMS_BASE }}/xblock"
INSIGHTS_VERSION: "master" #INSIGHTS_VERSION: "master"
INSIGHTS_VERSION: "open-release/ginkgo.master"
INSIGHTS_GIT_IDENTITY: !!null INSIGHTS_GIT_IDENTITY: !!null
INSIGHTS_REPOS: INSIGHTS_REPOS:
......
--- ---
NOTIFIER_WEB_USER: "www-data" NOTIFIER_WEB_USER: "www-data"
NOTIFIER_VENV_DIR: "{{ notifier_app_dir }}/virtualenvs/notifier" NOTIFIER_VENV_DIR: "{{ notifier_app_dir }}/virtualenvs/notifier"
NOTIFIER_SOURCE_REPO: "https://github.com/edx/notifier.git" #NOTIFIER_SOURCE_REPO: "https://github.com/edx/notifier.git"
NOTIFIER_SOURCE_REPO: "https://git.orhontech.com/edx/notifier.git"
NOTIFIER_CODE_DIR: "{{ notifier_app_dir }}/src" NOTIFIER_CODE_DIR: "{{ notifier_app_dir }}/src"
NOTIFIER_VERSION: "master" # NOTIFIER_VERSION: "master"
NOTIFIER_VERSION: "open-release/ginkgo.master"
NOTIFIER_REQUIREMENTS_FILE: "{{ NOTIFIER_CODE_DIR }}/requirements.txt" NOTIFIER_REQUIREMENTS_FILE: "{{ NOTIFIER_CODE_DIR }}/requirements.txt"
NOTIFIER_LOG_LEVEL: "INFO" NOTIFIER_LOG_LEVEL: "INFO"
NOTIFIER_RSYSLOG_ENABLED: "yes" NOTIFIER_RSYSLOG_ENABLED: "yes"
......
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