Merge pull request #200 from edx/jarv/vagrant-reorganization

Jarv/vagrant reorganization

playbooks/roles/edxapp/tasks/deploy.yml

@@ -146,6 +146,9 @@
   - install
   - deploy
 
+- name: changing group ownership to www-data for everything in the venv (workaround)
+  shell: chgrp -R www-data {{ venv_dir }}
+
 # This check needs to be run to see if rake can be used but its failure should not stop the run.
 - name: check if rake gather_assets is available
   shell: executable=/bin/bash chdir={{ edx_platform_code_dir }} rake -T | grep gather_assets

playbooks/roles/edxapp/vars/main.yml

@@ -198,7 +198,7 @@ edxapp_theme_version: 'HEAD'
 
 # make this the public URL instead of writable
 lms_source_repo: https://github.com/edx/edx-platform.git
-lms_version: 'HEAD'
+lms_version: 'release'
 local_requirements_file:  "{{ edx_platform_code_dir }}/requirements/edx/local.txt"
 pre_requirements_file:    "{{ edx_platform_code_dir }}/requirements/edx/pre.txt"
 post_requirements_file:   "{{ edx_platform_code_dir }}/requirements/edx/post.txt"

playbooks/vagrant-fullstack.yml

@@ -15,4 +15,11 @@
     - rabbitmq
     - xqueue
     - xserver
+    - oraclejdk
+    - elasticsearch
     - { role: 'edxapp', celery_worker: True }
+    - role: rbenv
+      rbenv_user: "{{ forum_user }}"
+      rbenv_user_home: "{{ forum_home }}"
+      rbenv_ruby_version: "{{ forum_ruby_version }}"
+    - forum

playbooks/vagrant-shortstack.yml

+- name: Configure instance(s)
+  hosts: vagrant
+  sudo: True
+  gather_facts: True
+  vars:
+    migrate_db: "yes"
+    openid_workaround: True
+  vars_files:
+    - "group_vars/all"
+  roles:
+    - common
+    - nginx
+    - edxlocal
+    - edxapp
+    - oraclejdk
+    - elasticsearch
+    - { role: 'edxapp', celery_worker: True }
+    - role: rbenv
+      rbenv_user: "{{ forum_user }}"
+      rbenv_user_home: "{{ forum_home }}"
+      rbenv_ruby_version: "{{ forum_ruby_version }}"
+    - forum

vagrant/fullstack/Vagrantfile

@@ -19,7 +19,7 @@ Vagrant.configure("2") do |config|
     ansible.playbook = "../../playbooks/vagrant-fullstack.yml"
 
     ansible.inventory_file = "../../playbooks/vagrant/inventory.ini"
-    ansible.extra_vars = { secure_dir: "secure_example", c_skip_grader_checkout: 'True' }
+    ansible.extra_vars = { c_skip_grader_checkout: 'True' }
     ansible.verbose = true
   end
 end

vagrant/shortstack-xml/Vagrantfile

+MEMORY = 512
+CPU_COUNT = 2
+
+Vagrant.configure("2") do |config|
+  config.vm.box     = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+  config.vm.network :private_network, ip: "192.168.33.10"
+
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--memory", MEMORY.to_s]
+
+    # You can adjust this to the amount of CPUs your system has available
+    vb.customize ["modifyvm", :id, "--cpus", CPU_COUNT.to_s]
+  end
+
+  config.vm.provision :ansible do |ansible|
+    # point Vagrant at the location of your playbook you want to run
+    ansible.playbook = "../../playbooks/vagrant-shortstack-xml.yml"
+
+    ansible.inventory_file = "../../playbooks/vagrant/inventory.ini"
+    ansible.verbose = true
+  end
+end

vagrant/shortstack/Vagrantfile

@@ -16,10 +16,9 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision :ansible do |ansible|
     # point Vagrant at the location of your playbook you want to run
-    ansible.playbook = "../../playbooks/vagrant.yml"
+    ansible.playbook = "../../playbooks/vagrant-shortstack.yml"
 
     ansible.inventory_file = "../../playbooks/vagrant/inventory.ini"
-    ansible.extra_vars = { secure_dir: "secure_example" }
     ansible.verbose = true
   end
 end