start filling out headers, fix oauth auto-reg

playbooks/roles/analytics_pipeline/meta/main.yml

@@ -9,15 +9,6 @@
 #
 ##
 # Role includes for role analytics_pipeline
-# 
-# Example:
-#
-# dependencies:
-#   - {
-#   role: my_role 
-#   my_role_var0: "foo"
-#   my_role_var1: "bar"
-# }
 
 dependencies:
   - common

playbooks/roles/analytics_pipeline/tasks/main.yml

@@ -13,12 +13,28 @@
 # 
 # Overview:
 # 
+# Prepare the machine to run the edX Analytics Data Pipeline. The pipeline currently "installs itself"
+# via an ansible playbook that is not included in the edx/configuration repo. However, in order to
+# run the pipeline in a devstack environment, some configuration needs to be performed. In a production
+# environment many of these config files are stored on S3.
 #
 # Dependencies:
 #
+# common: some of the variables from the common role are used here
+# hadoop_master: ensures hadoop services are installed
+# hive: the pipeline makes extensive usage of hive, so that needs to be installed as well
+# sqoop: similarly to hive, the pipeline uses this tool extensively
 # 
 # Example play:
 #
+# - name: Deploy all dependencies of edx-analytics-pipeline to the node
+#   hosts: all
+#   sudo: True
+#   gather_facts: True
+#   roles:
+#     - analytics_pipeline
+#
+# ansible-playbook -i 'localhost,' ./analytics_pipeline.yml  -e@/ansible/vars/deployment.yml -e@/ansible/vars/env-deployment.yml
 #
 
 - name: create config directory

playbooks/roles/insights/defaults/main.yml

@@ -12,6 +12,7 @@
 # 
 
 INSIGHTS_LMS_BASE: 'http://localhost:8000'
+INSIGHTS_BASE_URL: 'http://127.0.0.1:8110'
 INSIGHTS_MEMCACHE: [ 'localhost:11211' ]
 INSIGHTS_FEEDBACK_EMAIL: 'dashboard@example.com'
 INSIGHTS_MKTG_BASE: 'http://example.com'
@@ -22,6 +23,7 @@ INSIGHTS_OAUTH2_SECRET: 'secret'
 INSIGHTS_OAUTH2_URL_ROOT: '{{ INSIGHTS_LMS_BASE }}/oauth2'
 INSIGHTS_OAUTH2_APP_CLIENT_NAME: insights
 INSIGHTS_OAUTH2_APP_USERNAME: staff
+INSIGHTS_OAUTH2_APP_COMPLETE_URL: '{{ INSIGHTS_BASE_URL }}/complete/edx-oidc/'
 INSIGHTS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
 INSIGHTS_SECRET_KEY: 'YOUR_SECRET_KEY_HERE'
 INSIGHTS_OAUTH2_KEY: 'YOUR_OAUTH2_KEY'
@@ -168,6 +170,8 @@ insights_requirements:
   - production.txt
   - optional.txt
 
+insights_register_oauth_app: false
+
 #
 # OS packages
 #

playbooks/roles/insights/tasks/main.yml

@@ -136,6 +136,6 @@
 
 - name: register oauth2 application
   shell: >
-    . /edx/app/edxapp/edxapp_env && {{ COMMON_BIN_DIR }}/manage.edxapp lms --settings=aws create_oauth2_client "{{ INSIGHTS_OAUTH2_APP_URL_ROOT }}" "{{ INSIGHTS_OAUTH2_APP_URL_ROOT }}/complete/edx-oidc/" confidential --username "{{ INSIGHTS_OAUTH2_APP_USERNAME }}" --client_name "{{ INSIGHTS_OAUTH2_APP_CLIENT_NAME }}" --client_id "{{ INSIGHTS_OAUTH2_KEY }}" --client_secret "{{ INSIGHTS_OAUTH2_SECRET }}" --trusted
+    . /edx/app/edxapp/edxapp_env && {{ COMMON_BIN_DIR }}/manage.edxapp lms --settings=aws create_oauth2_client "{{ INSIGHTS_BASE_URL }}" "{{ INSIGHTS_OAUTH2_APP_COMPLETE_URL }}" confidential --username "{{ INSIGHTS_OAUTH2_APP_USERNAME }}" --client_name "{{ INSIGHTS_OAUTH2_APP_CLIENT_NAME }}" --client_id "{{ INSIGHTS_OAUTH2_KEY }}" --client_secret "{{ INSIGHTS_OAUTH2_SECRET }}" --trusted
   sudo_user: edxapp
   when: insights_register_oauth_app|bool
\ No newline at end of file

vagrant/base/devstack/Vagrantfile

@@ -140,5 +140,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         xqueue_version: ENV['OPENEDX_RELEASE'],
       }
     end
+    if ENV['CONFIGURATION_VERSION']
+      ansible.extra_vars['configuration_version'] = ENV['CONFIGURATION_VERSION']
+    end
+    if ENV['EDX_PLATFORM_VERSION']
+      ansible.extra_vars['edx_platform_version'] = ENV['EDX_PLATFORM_VERSION']
+    end
   end
 end