Merge pull request #447 from edx/jarv/final-release-updates

some final changes before the dosa release

util/jenkins/ansible-provision.sh

@@ -48,7 +48,7 @@ fi
 
 if [[ -z $ami ]]; then
   if [[ $server_type == "full_edx_installation" ]]; then
-    ami="ami-dfe4bcb6"
+    ami="ami-81e0c5e8"
   elif [[ $server_type == "ubuntu_12.04" ]]; then
     ami="ami-d0f89fb9"
   fi

vagrant/devstack/README.rst

@@ -18,5 +18,4 @@ The ``devstack`` instance is designed to run code and tests, but you can do most
 - You can load pages served by the running Vagrant instance.
 
 
-Installation instructions - https://github.com/edx/configuration/wiki#installing-edx-using-a-pre-built-vagrant-devstack-image
-Using the devstack - https://github.com/edx/configuration/wiki/Using-the-edX-devstack
+Wiki documation - https://github.com/edx/configuration/wiki/edX-Developer-Stack

vagrant/devstack/Vagrantfile

 MEMORY = 2048
 CPU_COUNT = 2
 
+edx_platform_mount_dir = "cs_comments_service"
+forum_mount_dir = "edx-platform"
+
+if ENV['VAGRANT_MOUNT_BASE']
+
+  edx_platform_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + forum_mount_dir
+  forum_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + edx_platform_mount_dir
+
+end
+
+
 Vagrant.configure("2") do |config|
 
 # Creates a devstack from a base Ubuntu 12.04 image
@@ -12,6 +23,9 @@ Vagrant.configure("2") do |config|
   config.vm.network :forwarded_port, guest: 8001, host: 8001
   config.vm.network :forwarded_port, guest: 4567, host: 4567
 
+  config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform", :create => true, nfs: true
+  config.vm.synced_folder "#{forum_mount_dir}", "/edx/app/forum/cs_comments_service", :create => true, nfs: true
+
   config.hostsupdater.aliases = ["preview.localhost"]
 
   config.vm.provider :virtualbox do |vb|