More review comments addressed

playbooks/edx-east/analytics_single.yml

@@ -5,7 +5,6 @@
   vars:
     migrate_db: "yes"
     disable_edx_services: true
-    insights_register_oauth_app: yes
     EDXAPP_LMS_BASE: 127.0.0.1:8000
     EDXAPP_OAUTH_ENFORCE_SECURE: false
     EDXAPP_LMS_BASE_SCHEME: http

playbooks/roles/hadoop_common/defaults/main.yml

@@ -25,6 +25,7 @@ HADOOP_COMMON_TOOL_HEAP_MAX: 128
 hadoop_common_role_name: hadoop_common
 hadoop_common_user: hadoop
 hadoop_common_group: hadoop
+hadoop_common_temporary_dir: /var/tmp
 hadoop_common_dist:
   filename: "hadoop-{{ HADOOP_COMMON_VERSION }}.tar.gz"
   url: "https://archive.apache.org/dist/hadoop/core/hadoop-{{ HADOOP_COMMON_VERSION }}/hadoop-{{ HADOOP_COMMON_VERSION }}.tar.gz"
@@ -38,7 +39,7 @@ hadoop_common_native_dist:
   url: "https://github.com/apache/hadoop-common/archive/release-{{ HADOOP_COMMON_VERSION }}.tar.gz"
   sha256sum: a8e1b49d4e891255d465e9449346ac7fb259bb35dce07d9f0df3b46fac3e9bd0
 hadoop_common_java_home: "{{ oraclejdk_link }}"
-hadoop_common_env: "{{ HADOOP_COMMON_HOME }}/.hadoop_env"
+hadoop_common_env: "{{ HADOOP_COMMON_HOME }}/hadoop_env"
 
 #
 # OS packages

playbooks/roles/hadoop_common/tasks/main.yml

@@ -64,14 +64,13 @@
   get_url: >
     url={{ hadoop_common_dist.url }}
     sha256sum={{ hadoop_common_dist.sha256sum }}
-    validate_certs=no
-    dest=/tmp
+    dest={{ hadoop_common_temporary_dir }}
   when: not extracted_hadoop_dir.stat.exists
 
 - name: distribution extracted
   shell: >
     chdir={{ HADOOP_COMMON_USER_HOME }}
-    tar -xzf /tmp/{{ hadoop_common_dist.filename }} && chown -R {{ hadoop_common_user }}:{{ hadoop_common_group }} hadoop-{{ HADOOP_COMMON_VERSION }}
+    tar -xzf {{ hadoop_common_temporary_dir }}/{{ hadoop_common_dist.filename }} && chown -R {{ hadoop_common_user }}:{{ hadoop_common_group }} hadoop-{{ HADOOP_COMMON_VERSION }}
   when: not extracted_hadoop_dir.stat.exists
 
 - name: versioned directory symlink created
@@ -127,19 +126,18 @@
   get_url: >
     url={{ hadoop_common_protobuf_dist.url }}
     sha256sum={{ hadoop_common_protobuf_dist.sha256sum }}
-    validate_certs=no
-    dest=/tmp
+    dest={{ hadoop_common_temporary_dir }}
   when: not native_libs_built.stat.exists
 
 - name: protobuf extracted
   shell: >
-    chdir=/tmp
+    chdir={{ hadoop_common_temporary_dir }}
     tar -xzf {{ hadoop_common_protobuf_dist.filename }}
   when: not native_libs_built.stat.exists
 
 - name: protobuf installed
   shell: >
-    chdir=/tmp/protobuf-{{ HADOOP_COMMON_PROTOBUF_VERSION }}
+    chdir={{ hadoop_common_temporary_dir }}/protobuf-{{ HADOOP_COMMON_PROTOBUF_VERSION }}
     ./configure --prefix=/usr/local && make && make install
   when: not native_libs_built.stat.exists
 
@@ -147,19 +145,18 @@
   get_url: >
     url={{ hadoop_common_native_dist.url }}
     sha256sum={{ hadoop_common_native_dist.sha256sum }}
-    validate_certs=no
-    dest=/tmp/{{ hadoop_common_native_dist.filename }}
+    dest={{ hadoop_common_temporary_dir }}/{{ hadoop_common_native_dist.filename }}
   when: not native_libs_built.stat.exists
 
 - name: native lib source extracted
   shell: >
-    chdir=/tmp
+    chdir={{ hadoop_common_temporary_dir }}
     tar -xzf {{ hadoop_common_native_dist.filename }}
   when: not native_libs_built.stat.exists
 
 - name: native lib built
   shell: >
-    chdir=/tmp/hadoop-common-release-{{ HADOOP_COMMON_VERSION }}/hadoop-common-project
+    chdir={{ hadoop_common_temporary_dir }}/hadoop-common-release-{{ HADOOP_COMMON_VERSION }}/hadoop-common-project
     mvn package -X -Pnative -DskipTests
   environment:
     LD_LIBRARY_PATH: /usr/local/lib
@@ -176,7 +173,7 @@
 
 - name: new native libs installed
   shell: >
-    chdir=/tmp/hadoop-common-release-{{ HADOOP_COMMON_VERSION }}/hadoop-common-project/hadoop-common/target/native/target/usr/local/lib
+    chdir={{ hadoop_common_temporary_dir }}/hadoop-common-release-{{ HADOOP_COMMON_VERSION }}/hadoop-common-project/hadoop-common/target/native/target/usr/local/lib
     chown {{ hadoop_common_user }}:{{ hadoop_common_group }} {{ item }} && cp {{ item }} {{ HADOOP_COMMON_HOME }}/lib/native/{{ item }}
   with_items:
     - libhadoop.a

playbooks/roles/hive/defaults/main.yml

@@ -20,6 +20,7 @@ HIVE_CONF: "{{ HIVE_HOME }}/conf"
 # vars are namespace with the module name.
 #
 hive_role_name: hive
+hive_temporary_dir: /var/tmp
 hive_dist:
   filename: "hive-{{ HIVE_VERSION }}-bin.tar.gz"
   url: "https://archive.apache.org/dist/hive/hive-{{ HIVE_VERSION }}/hive-{{ HIVE_VERSION }}-bin.tar.gz"

playbooks/roles/hive/tasks/main.yml

@@ -28,14 +28,13 @@
   get_url: >
     url={{ hive_dist.url }}
     sha256sum={{ hive_dist.sha256sum }}
-    validate_certs=no
-    dest=/tmp
+    dest={{ hive_temporary_dir }}
   when: not extracted_dir.stat.exists
 
 - name: distribution extracted
   shell: >
     chdir={{ HADOOP_COMMON_USER_HOME }}
-    tar -xzf /tmp/{{ hive_dist.filename }} && chown -R {{ hadoop_common_user }}:{{ hadoop_common_group }} hive-{{ HIVE_VERSION }}-bin
+    tar -xzf {{ hive_temporary_dir }}/{{ hive_dist.filename }} && chown -R {{ hadoop_common_user }}:{{ hadoop_common_group }} hive-{{ HIVE_VERSION }}-bin
   when: not extracted_dir.stat.exists
 
 - name: versioned directory symlink created

playbooks/roles/insights/defaults/main.yml

@@ -170,8 +170,6 @@ insights_requirements:
   - production.txt
   - optional.txt
 
-insights_register_oauth_app: false
-
 #
 # OS packages
 #

playbooks/roles/insights/tasks/main.yml

@@ -133,9 +133,3 @@
     name={{ insights_service_name }}
   when: not disable_edx_services
   sudo_user: "{{ supervisor_service_user }}"
-
-- name: register oauth2 application
-  shell: >
-    . /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

playbooks/roles/local_dev/defaults/main.yml

@@ -33,3 +33,5 @@ localdev_jscover_version: "1.0.2"
 localdev_oauth2_clients:
     - { name: "{{ ecommerce_service_name }}", url_root: "{{ ECOMMERCE_ECOMMERCE_URL_ROOT }}",
         id: "{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_KEY }}", secret: "{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET }}" }
+    - { name: "{{ INSIGHTS_OAUTH2_APP_CLIENT_NAME | default('insights') }}", url_root: "{{ INSIGHTS_BASE_URL | default('http://127.0.0.1:8100') }}",
+        id: "{{ INSIGHTS_OAUTH2_KEY | default('YOUR_OAUTH2_KEY') }}", secret: "{{ INSIGHTS_OAUTH2_SECRET | default('secret') }}" }

playbooks/roles/sqoop/tasks/main.yml

@@ -28,7 +28,6 @@
   get_url: >
     url={{ sqoop_dist.url }}
     sha256sum={{ sqoop_dist.sha256sum }}
-    validate_certs=no
     dest={{ sqoop_temporary_dir }}
   when: not installed.stat.exists
 
@@ -48,7 +47,6 @@
   get_url: >
     url={{ sqoop_mysql_connector_dist.url }}
     sha256sum={{ sqoop_mysql_connector_dist.sha256sum }}
-    validate_certs=no
     dest={{ sqoop_temporary_dir }}
   when: not installed.stat.exists
 

playbooks/vagrant-analytics.yml

@@ -8,7 +8,6 @@
     devstack: true
     disable_edx_services: true
     mongo_enable_journal: false
-    insights_register_oauth_app: yes
     EDXAPP_NO_PREREQ_INSTALL: 0
     COMMON_MOTD_TEMPLATE: 'devstack_motd.tail.j2'
     COMMON_SSH_PASSWORD_AUTH: "yes"
@@ -26,8 +25,6 @@
     - forum
     - role: notifier
       NOTIFIER_DIGEST_TASK_INTERVAL: "5"
-    - role: ora
-      when: ENABLE_LEGACY_ORA
     - browsers
     - browsermob-proxy
     - local_dev

vagrant/base/analyticstack/Vagrantfile

@@ -11,7 +11,6 @@ CPU_COUNT = 2
 edx_platform_mount_dir = "edx-platform"
 themes_mount_dir = "themes"
 forum_mount_dir = "cs_comments_service"
-ora_mount_dir = "ora"
 insights_mount_dir = "insights"
 analytics_api_mount_dir = "analytics_api"
 
@@ -20,7 +19,6 @@ if ENV['VAGRANT_MOUNT_BASE']
   edx_platform_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + edx_platform_mount_dir
   themes_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + themes_mount_dir
   forum_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + forum_mount_dir
-  ora_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + ora_mount_dir
   insights_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + insights_mount_dir
   analytics_api_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + analytics_api_mount_dir
 
@@ -59,11 +57,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       create: true, owner: "edxapp", group: "www-data"
     config.vm.synced_folder "#{forum_mount_dir}", "/edx/app/forum/cs_comments_service",
       create: true, owner: "forum", group: "www-data"
-
-    if ENV['ENABLE_LEGACY_ORA']
-        config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora",
-          create: true, owner: "ora", group: "www-data"
-    end
+    config.vm.synced_folder "#{insights_mount_dir}", "/edx/app/insights/edx_analytics_dashboard",
+      create: true, owner: "insights", group: "www-data"
+    config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api",
+      create: true, owner: "analytics_api", group: "www-data"
     config.vm.synced_folder "#{insights_mount_dir}", "/edx/app/insights/edx_analytics_dashboard",
       create: true, owner: "insights", group: "www-data"
     config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api",
@@ -75,12 +72,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       create: true, nfs: true
     config.vm.synced_folder "#{forum_mount_dir}", "/edx/app/forum/cs_comments_service",
       create: true, nfs: true
-
-    if ENV['ENABLE_LEGACY_ORA']
-        config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora",
-          create: true, nfs: true
-    end
-
     config.vm.synced_folder "#{insights_mount_dir}", "/edx/app/insights/edx_analytics_dashboard",
       create: true, nfs: true
     config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api",