fix the analyticstack box (#3396)

* fix the analyticstack box (#3369)

* revert change to vagrant version

playbooks/vagrant-analytics.yml

@@ -21,13 +21,16 @@
     - edxlocal
     - memcache
     - mongo
+    - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
     - edxapp
     - oraclejdk
     - elasticsearch
     - forum
     - ecommerce
     - ecomworker
-    - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
+    - programs
+    - role: notifier
+      NOTIFIER_DIGEST_TASK_INTERVAL: "5"
     - analytics_api
     - insights
     - local_dev

vagrant/base/analyticstack/Vagrantfile

@@ -28,6 +28,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.network :forwarded_port, guest: 8001, host: 8001  # Studio
     config.vm.network :forwarded_port, guest: 8002, host: 8002  # Ecommerce
     config.vm.network :forwarded_port, guest: 8003, host: 8003  # LMS for Bok Choy
+    config.vm.network :forwarded_port, guest: 8004, host: 8004  # Programs
     config.vm.network :forwarded_port, guest: 8031, host: 8031  # Studio for Bok Choy
     config.vm.network :forwarded_port, guest: 8120, host: 8120  # edX Notes Service
     config.vm.network :forwarded_port, guest: 8765, host: 8765
@@ -77,6 +78,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         forum_version: ENV['OPENEDX_RELEASE'],
         xqueue_version: ENV['OPENEDX_RELEASE'],
         demo_version: ENV['OPENEDX_RELEASE'],
+        NOTIFIER_VERSION: ENV['OPENEDX_RELEASE'],
+        ECOMMERCE_VERSION: ENV['OPENEDX_RELEASE'],
+        ECOMMERCE_WORKER_VERSION: ENV['OPENEDX_RELEASE'],
+        PROGRAMS_VERSION: ENV['OPENEDX_RELEASE'],
         ANALYTICS_API_VERSION: ENV['OPENEDX_RELEASE'],
         INSIGHTS_VERSION: ENV['OPENEDX_RELEASE'],
       }
@@ -90,5 +95,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     if ENV['ECOMMERCE_VERSION']
       ansible.extra_vars['ECOMMERCE_VERSION'] = ENV['ECOMMERCE_VERSION']
     end
+    if ENV['ECOMMERCE_WORKER_VERSION']
+      ansible.extra_vars['ECOMMERCE_WORKER_VERSION'] = ENV['ECOMMERCE_WORKER_VERSION']
+    end
+    if ENV['PROGRAMS_VERSION']
+      ansible.extra_vars['PROGRAMS_VERSION'] = ENV['PROGRAMS_VERSION']
+    end
   end
 end

vagrant/release/analyticstack/Vagrantfile

@@ -25,6 +25,10 @@ if [ -n "$OPENEDX_RELEASE" ]; then
     -e forum_version=$OPENEDX_RELEASE \
     -e xqueue_version=$OPENEDX_RELEASE \
     -e demo_version=$OPENEDX_RELEASE \
+    -e NOTIFIER_VERSION=$OPENEDX_RELEASE \
+    -e ECOMMERCE_VERSION=$OPENEDX_RELEASE \
+    -e ECOMMERCE_WORKER_VERSION=$OPENEDX_RELEASE \
+    -e PROGRAMS_VERSION=$OPENEDX_RELEASE \
     -e ANALYTICS_API_VERSION=$OPENEDX_RELEASE \
     -e INSIGHTS_VERSION=$OPENEDX_RELEASE \
   "
@@ -49,6 +53,7 @@ MOUNT_DIRS = {
   :forum => {:repo => "cs_comments_service", :local => "/edx/app/forum/cs_comments_service", :owner => "forum"},
   :ecommerce => {:repo => "ecommerce", :local => "/edx/app/ecommerce/ecommerce", :owner => "ecommerce"},
   :ecommerce_worker => {:repo => "ecommerce-worker", :local => "/edx/app/ecommerce_worker/ecommerce_worker", :owner => "ecommerce_worker"},
+  :programs => {:repo => "programs", :local => "/edx/app/programs/programs", :owner => "programs"},
   :insights => {:repo => "insights", :local => "/edx/app/insights/edx_analytics_dashboard", :owner => "insights"},
   :analytics_api => {:repo => "analytics_api", :local => "/edx/app/analytics_api/analytics_api", :owner => "analytics_api"},
   :analytics_pipeline => {:repo => "edx-analytics-pipeline", :local => "/edx/app/analytics_pipeline/analytics_pipeline", :owner => "hadoop"},
@@ -65,14 +70,11 @@ end
 # to a name and a file path, which are used for retrieving
 # a Vagrant box from the internet.
 openedx_releases = {
-  "named-release/dogwood.rc" => {
-    :name => "analyticstack", :file => "dogwood-analyticstack-2016-03-15.box",
-  },
-  "named-release/dogwood.1" => {
-    :name => "analyticstack", :file => "dogwood-analyticstack-2016-03-15.box",
+  "open-release/eucalyptus" => {
+    :name => "eucalyptus-analyticstack-2016-09-04", :file => "eucalyptus-analyticstack-2016-09-04.box",
   },
-  "named-release/dogwood.2" => {
-    :name => "analyticstack", :file => "dogwood-analyticstack-2016-03-15.box",
+  "open-release/eucalyptus.2" => {
+    :name => "eucalyptus-analyticstack-2016-09-04", :file => "eucalyptus-analyticstack-2016-09-04.box",
   },
   "named-release/dogwood.3" => {
     :name => "analyticstack", :file => "dogwood-analyticstack-2016-03-15.box",