Merge pull request #176 from edx/feanil/multiple_vagrants

Feanil/multiple vagrants

playbooks/roles/rabbitmq/tasks/main.yml

@@ -8,7 +8,6 @@
 
 - name: install python-software-properties if debian
   apt: pkg={{",".join(rabbitmq_debian_pkgs)}} state=present
-  when: ansible_distribution == 'Debian'
 
 - name: add rabbit repository
   apt_repository: repo="{{rabbitmq_repository}}" state=present

playbooks/roles/xqueue/tasks/main.yml

@@ -4,7 +4,7 @@
 #  - nginx/tasks/main.yml
 ---
 - name: Change permissions on datadir
-  file: path={{xqueue_code_dir}}/../data state=directory owner=www-data group=www-data
+  file: path={{app_base_dir}}/data state=directory owner=www-data group=www-data
   tags:
   - xqueue
 
@@ -32,7 +32,7 @@
   - xqueue
 
 - name: create xqueue application config
-  template: src=xqueue.env.json.j2 dest={{xqueue_code_dir}}/../env.json mode=0640 owner=www-data group=adm
+  template: src=xqueue.env.json.j2 dest={{app_base_dir}}/env.json mode=0640 owner=www-data group=adm
   notify:
   - restart xqueue
   - restart xqueue consumer
@@ -40,7 +40,7 @@
   - xqueue
 
 - name: create xqueue auth file
-  template: src=xqueue.auth.json.j2 dest={{xqueue_code_dir}}/../auth.json mode=0640 owner=www-data group=adm
+  template: src=xqueue.auth.json.j2 dest={{app_base_dir}}/auth.json mode=0640 owner=www-data group=adm
   notify:
   - restart xqueue
   - restart xqueue consumer

playbooks/roles/xserver/tasks/deploy.yml

@@ -32,6 +32,7 @@
   git: dest={{xserver_grader_dir}} repo={{xserver_grader_source}} version={{xserver_grader_version}}
   environment:
     GIT_SSH: /tmp/git_ssh.sh
+  when: c_skip_grader_checkout is not defined or c_skip_grader_checkout==False
   tags:
   - deploy
 

playbooks/vagrant-fullstack.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
+    - rabbitmq
+    - xqueue
+    - xserver
+    - { role: 'edxapp', celery_worker: True }

playbooks/vagrant.yml

@@ -7,7 +7,6 @@
     openid_workaround: True
   vars_files:
     - "group_vars/all"
-    - "{{ secure_dir }}/vars/edxapp_ref_users.yml"
   roles:
     - common
     - nginx

vagrant/fullstack/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-fullstack.yml"
+
+    ansible.inventory_file = "../../playbooks/vagrant/inventory.ini"
+    ansible.extra_vars = { secure_dir: "secure_example", c_skip_grader_checkout: 'True' }
+    ansible.verbose = true
+  end
+end

vagrant/fullstack/ansible.cfg

+../../playbooks/ansible.cfg
\ No newline at end of file

Vagrantfile → vagrant/shortstack/Vagrantfile

@@ -16,9 +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.yml"
 
-    ansible.inventory_file = "playbooks/vagrant/inventory.ini"
+    ansible.inventory_file = "../../playbooks/vagrant/inventory.ini"
     ansible.extra_vars = { secure_dir: "secure_example" }
     ansible.verbose = true
   end