Merge pull request #1246 from edx/release

Master ... release

CHANGELOG.md

+- Role: analytics-api
+  - Added a new role for the analytics-api Django app.  Currently a private repo
+
+- Logrotation now happens hourly by default for all logs.
+
 - Role: xqwatcher, xqueue, nginx, edxapp, common
   - Moving nginx basic authorization flag and credentials to the common role
+  - Basic auth will be turned on by default
 
 - Role: Edxapp
   - Turn on code sandboxing by default and allow the jailed code to be able to write
@@ -9,6 +15,6 @@
   - The repo.txt requirements file is no longer being processed in anyway.  This file was removed from edxplatform
     via pull #3487(https://github.com/edx/edx-platform/pull/3487)
 
-- Update CMS_HOSTNAME default to allow any hostname that starts with `studio` along with `prod-studio` or `stage-studio`.
+- Update `CMS_HOSTNAME` default to allow any hostname that starts with `studio` along with `prod-studio` or `stage-studio`.
 
 - Start a change log to keep track of backwards incompatible changes and deprecations.

playbooks/roles/common/tasks/main.yml

@@ -60,21 +60,17 @@
     owner=root group=root mode=644
   notify: restart rsyslogd
 
+  # This is in common to keep all logrotation config
+  # in the same role
+- name: Create hourly subdirectory in logrotate.d
+  file: path=/etc/logrotate.d/hourly state=directory
+
 - name: Install logrotate configuration for edX
   template: >
     dest=/etc/logrotate.d/hourly/edx-services
     src=etc/logrotate.d/hourly/edx_logrotate.j2
     owner=root group=root mode=644
 
-  # This can be removed after new release of edX
-- name: Remove old edx-services config from /etc/logrotate.d
-  file: path=/etc/logrotate.d/edx-services state=absent
-
-  # This is in common to keep all logrotation config
-  # in the same role
-- name: Create hourly subdirectory in logrotate.d
-  file: path=/etc/logrotate.d/hourly state=directory
-
 - name: Install logrotate configuration for tracking file
   template: >
     dest=/etc/logrotate.d/hourly/tracking.log
@@ -87,10 +83,6 @@
     src=etc/cron.hourly/logrotate
     owner=root group=root mode=555
 
-  # This can be removed after new release of edX
-- name: Remove old tracking.log config from /etc/logrotate.d
-  file: path=/etc/logrotate.d/tracking.log state=absent
-
 - name: update /etc/hosts
   template: src=hosts.j2 dest=/etc/hosts
   when: COMMON_HOSTNAME

playbooks/roles/edxapp/defaults/main.yml

@@ -468,6 +468,7 @@ generic_env_config:  &edxapp_generic_env
   PLATFORM_FACEBOOK_ACCOUNT: $EDXAPP_PLATFORM_FACEBOOK_ACCOUNT
   ORA2_FILE_PREFIX: $EDXAPP_ORA2_FILE_PREFIX
 
+
 lms_auth_config:
   <<: *edxapp_generic_auth
   PEARSON_TEST_PASSWORD: $EDXAPP_PEARSON_TEST_PASSWORD

util/jenkins/ansible-provision.sh

@@ -81,7 +81,7 @@ fi
 
 if [[ -z $ami ]]; then
   if [[ $server_type == "full_edx_installation" ]]; then
-    ami="ami-97dbc3fe"
+    ami="ami-f0814498"
   elif [[ $server_type == "ubuntu_12.04" || $server_type == "full_edx_installation_from_scratch" ]]; then
     ami="ami-59a4a230"
   elif [[ $server_type == "ubuntu_14.04(experimental)" ]]; then

vagrant/base/devstack/Vagrantfile

 Vagrant.require_version ">= 1.5.3"
+unless Vagrant.has_plugin?("vagrant-vbguest")
+  raise "Please install the vagrant-vbguest plugin by running `vagrant plugin install vagrant-vbguest`"
+end
 
 VAGRANTFILE_API_VERSION = "2"
 
@@ -6,18 +9,19 @@ MEMORY = 2048
 CPU_COUNT = 2
 
 edx_platform_mount_dir = "edx-platform"
+themes_mount_dir = "themes"
 forum_mount_dir = "cs_comments_service"
 ora_mount_dir = "ora"
 
 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
 
 end
 
-
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates a devstack from a base Ubuntu 12.04 image for virtualbox
@@ -33,15 +37,33 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.ssh.insert_key = true
 
   config.vm.synced_folder  ".", "/vagrant", disabled: true
-  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.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora", :create => true, nfs: true
 
-  # Enable X11 forwarding so we can interact with GUI applications
+ # Enable X11 forwarding so we can interact with GUI applications
   if ENV['VAGRANT_X11']
-      config.ssh.forward_x11 = true
+    config.ssh.forward_x11 = true
+  end
+
+  if ENV['VAGRANT_USE_VBOXFS'] == 'true'
+    config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform",
+      create: true, owner: "edxapp", group: "www-data"
+    config.vm.synced_folder "#{themes_mount_dir}", "/edx/app/edxapp/themes",
+      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"
+    config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora",
+      create: true, owner: "ora", group: "www-data"
+  else
+    config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform",
+      create: true, nfs: true
+    config.vm.synced_folder "#{themes_mount_dir}", "/edx/app/edxapp/themes",
+      create: true, nfs: true
+    config.vm.synced_folder "#{forum_mount_dir}", "/edx/app/forum/cs_comments_service",
+      create: true, nfs: true
+    config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora",
+      create: true, nfs: true
   end
 
+
   config.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--memory", MEMORY.to_s]
     vb.customize ["modifyvm", :id, "--cpus", CPU_COUNT.to_s]
@@ -66,9 +88,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # See: https://github.com/mitchellh/vagrant/issues/1188
   config.vm.provision "shell", inline: 'echo \'LC_ALL="en_US.UTF-8"\' > /etc/default/locale'
 
+  # Use vagrant-vbguest plugin to make sure Guest Additions are in sync
+  config.vbguest.auto_reboot = true
+  config.vbguest.auto_update = true
+
   config.vm.provision :ansible do |ansible|
     ansible.playbook = "../../../playbooks/vagrant-devstack.yml"
     ansible.verbose = "vvvv"
-
   end
 end

vagrant/release/devstack/Vagrantfile

@@ -23,7 +23,7 @@ cd /edx/app/edx_ansible/edx_ansible/playbooks
 # this can cause problems (e.g. looking for templates that no longer exist).
 /edx/bin/update configuration release
 
-ansible-playbook -i localhost, -c local vagrant-devstack.yml -e configuration_version=release
+ansible-playbook -i localhost, -c local vagrant-devstack.yml --tags=deploy -e configuration_version=release
 SCRIPT
 
 edx_platform_mount_dir = "edx-platform"
@@ -43,9 +43,8 @@ end
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates an edX devstack VM from an official release
-  config.vm.box     = "injera-devstack"
-  config.vm.synced_folder  ".", "/vagrant", disabled: true
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20140418-injera-devstack.box"
+  config.vm.box     = "johnnycake-devstack"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140625-johnnycake-devstack.box"
 
   config.vm.network :private_network, ip: "192.168.33.10"
   config.vm.network :forwarded_port, guest: 8000, host: 8000
@@ -55,15 +54,32 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, guest: 9200, host: 9200
   config.ssh.insert_key = true
 
+  config.vm.synced_folder  ".", "/vagrant", disabled: true
+
   # Enable X11 forwarding so we can interact with GUI applications
   if ENV['VAGRANT_X11']
-      config.ssh.forward_x11 = true
+    config.ssh.forward_x11 = true
   end
 
-  config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform", :create => true, nfs: true
-  config.vm.synced_folder "#{themes_mount_dir}", "/edx/app/edxapp/themes", :create => true, nfs: true
-  config.vm.synced_folder "#{forum_mount_dir}", "/edx/app/forum/cs_comments_service", :create => true, nfs: true
-  config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora", :create => true, nfs: true
+  if ENV['VAGRANT_USE_VBOXFS'] == 'true'
+    config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform",
+      create: true, owner: "edxapp", group: "www-data"
+    config.vm.synced_folder "#{themes_mount_dir}", "/edx/app/edxapp/themes",
+      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"
+    config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora",
+      create: true, owner: "ora", group: "www-data"
+  else
+    config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform",
+      create: true, nfs: true
+    config.vm.synced_folder "#{themes_mount_dir}", "/edx/app/edxapp/themes",
+      create: true, nfs: true
+    config.vm.synced_folder "#{forum_mount_dir}", "/edx/app/forum/cs_comments_service",
+      create: true, nfs: true
+    config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora",
+      create: true, nfs: true
+  end
 
   config.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--memory", MEMORY.to_s]
@@ -90,5 +106,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Assume that the base box has the edx_ansible role installed
   # We can then tell the Vagrant instance to update itself.
   config.vm.provision "shell", inline: $script
-
 end

vagrant/release/fullstack/Vagrantfile

@@ -8,8 +8,8 @@ CPU_COUNT = 2
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates an edX fullstack VM from an official release
-  config.vm.box     = "injera-fullstack"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20140418-injera-fullstack.box"
+  config.vm.box     = "johnnycake-fullstack"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140625-johnnycake-fullstack.box"
 
   config.vm.synced_folder  ".", "/vagrant", disabled: true
   config.ssh.insert_key = true
@@ -25,7 +25,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # http://askubuntu.com/questions/238040/how-do-i-fix-name-service-for-vagrant-client
     vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
   end
- 
+
   ["vmware_fusion", "vmware_workstation"].each do |vmware_provider|
     config.vm.provider vmware_provider do |v, override|
       override.vm.box     = "injera-fullstack-vmware"