Merge pull request #553 from edx/feanil/jarv-abbey-ami

Feanil/jarv abbey ami

playbooks/edx-east/edx_dev2.yml

@@ -24,7 +24,7 @@
       EDXAPP_LMS_NGINX_PORT: 80
       EDXAPP_CMS_NGINX_PORT: 80
       edxapp_lms_env: 'lms.envs.load_test'
-      edx_platform_commit: 'sarina/install-datadog'
+      edx_platform_version: 'sarina/install-datadog'
 - hosts: tag_aws_cloudformation_stack-name_dev2:&tag_group_worker
   sudo: True
   vars_files:
@@ -41,7 +41,7 @@
     - role: 'edxapp'
       edxapp_lms_env: 'lms.envs.load_test'
       celery_worker: True
-      edx_platform_commit: 'sarina/install-datadog'
+      edx_platform_version: 'sarina/install-datadog'
 #- hosts: tag_aws_cloudformation_stack-name_dev2:&tag_group_xserver
 #  sudo: True
 #  vars_files:

playbooks/edx-east/edx_feanilsandbox.yml

@@ -14,7 +14,7 @@
       - lms-preview
     - role: 'edxapp'
       edxapp_lms_env: 'lms.envs.load_test'
-      edx_platform_commit: 'release'
+      edx_platform_version: 'release'
     - splunkforwarder
 - hosts: tag_aws_cloudformation_stack-name_feanilsandbox:&tag_role_worker
   sudo: True
@@ -32,7 +32,7 @@
     - role: 'edxapp'
       edxapp_lms_env: 'lms.envs.load_test'
       celery_worker: True
-      edx_platform_commit: 'release'
+      edx_platform_version: 'release'
     - splunkforwarder
 - hosts: tag_aws_cloudformation_stack-name_feanilsandbox:&tag_role_xserver
   sudo: True

playbooks/edx-east/worker.yml

+- name: Deploy worker
+  hosts: all
+  sudo: True
+  gather_facts: True
+  vars_files:
+    - ["{{ secure_vars }}", "dummy.yml"]
+  roles:
+    - role: edxapp
+      celery_worker: True

playbooks/roles/edxapp/defaults/main.yml

@@ -417,9 +417,9 @@ edxapp_theme_version: 'HEAD'
 
 # make this the public URL instead of writable
 edx_platform_repo: "https://{{ COMMON_GIT_MIRROR }}/edx/edx-platform.git"
-# `edx_platform_commit` can be anything that git recognizes as a commit
+# `edx_platform_version` can be anything that git recognizes as a commit
 # reference, including a tag, a branch name, or a commit hash
-edx_platform_commit: 'release'
+edx_platform_version: 'release'
 local_requirements_file:  "{{ edxapp_code_dir }}/requirements/edx/local.txt"
 pre_requirements_file:    "{{ edxapp_code_dir }}/requirements/edx/pre.txt"
 post_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/post.txt"

playbooks/roles/edxapp/tasks/deploy.yml

@@ -10,7 +10,7 @@
 
 # Do A Checkout
 - name: edxapp | checkout edx-platform repo into {{edxapp_code_dir}}
-  git: dest={{edxapp_code_dir}} repo={{edx_platform_repo}} version={{edx_platform_commit}}
+  git: dest={{edxapp_code_dir}} repo={{edx_platform_repo}} version={{edx_platform_version}}
   register: chkout
   sudo_user: "{{ edxapp_user }}"
   notify:

playbooks/vagrant-devstack.yml

@@ -6,7 +6,7 @@
     migrate_db: "yes"
     openid_workaround: True
     devstack: True
-    edx_platform_commit: 'master'
+    edx_platform_version: 'master'
     mongo_enable_journal: False
     EDXAPP_NO_PREREQ_INSTALL: 0
   vars_files:

playbooks/vagrant-fullstack.yml

@@ -6,7 +6,7 @@
     migrate_db: "yes"
     openid_workaround: True
     EDXAPP_LMS_NGINX_PORT: '80'
-    edx_platform_commit: 'master'
+    edx_platform_version: 'master'
   vars_files:
     - "group_vars/all"
   roles:

util/jenkins/create-var-file.sh

@@ -19,7 +19,7 @@ CERTS_AWS_ID: $(cat /var/lib/jenkins/certs-aws-id)
 CERTS_BUCKET: "verify-test.edx.org"
 migrate_db: "yes"
 openid_workaround: True
-edx_platform_commit: $edxapp_version
+edx_platform_version: $edxapp_version
 forum_version: $forum_version
 xqueue_version: $xqueue_version
 xserver_version: $xserver_version